From c0271afdc465b3a43553aebdd3c9b358c86e529a Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Wed, 25 May 2016 11:41:36 -0700 Subject: [PATCH 1/2] Reset endpoint port info on connectivity revoke in bridge driver - and update it to store. Otherwise after an ungraceful shutdown, at next boot there will be in store two bridge endpoints with same port-mapping data. When bridge driver will try to restore the endpoints, there will be conflicts and a container with restart policy could fail to start. Signed-off-by: Alessandro Boch --- drivers/bridge/bridge.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/bridge/bridge.go b/drivers/bridge/bridge.go index 777f7b162e..64492eddc2 100644 --- a/drivers/bridge/bridge.go +++ b/drivers/bridge/bridge.go @@ -1318,6 +1318,12 @@ func (d *driver) RevokeExternalConnectivity(nid, eid string) error { logrus.Warn(err) } + endpoint.portMapping = nil + + if err = d.storeUpdate(endpoint); err != nil { + return fmt.Errorf("failed to update bridge endpoint %s to store: %v", endpoint.id[0:7], err) + } + return nil } From 529a4c3506bb34b8aaca1a3c2452a6a3d0e6d721 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Wed, 12 Oct 2016 12:01:18 -0700 Subject: [PATCH 2/2] Force go 1.7.1 in circle.yml to resolve failure to get golint Signed-off-by: Alessandro Boch --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index a5db509c67..bd34a8f19b 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,6 @@ machine: + environment: + GODIST: "go1.7.1.linux-amd64.tar.gz" services: - docker