Fix net driver response loss on createEndpoint

Siarhei Rasiukevich · Siarhei Rasiukevich · commit fe9a5a225d3d · 2018-06-26T13:27:47.000+03:00
Fix related to bug: docker/for-linux#348 We should perform updateToStore(ep) after n.addEndpoint or do update twice, otherwise response from network plugin will not be written to KV storage. This results in container creation with broken network config. Signed-off-by: Siarhei Rasiukevich <raskintech@gmail.com>
diff --git a/libnetwork/network.go b/libnetwork/network.go
@@ -1156,26 +1156,27 @@ func (n *network) createEndpoint(name string, options ...EndpointOption) (Endpoi
 			ep.releaseAddress()
 		}
 	}()
-	// Moving updateToSTore before calling addEndpoint so that we shall clean up VETH interfaces in case
-	// DockerD get killed between addEndpoint and updateSTore call
-	if err = n.getController().updateToStore(ep); err != nil {
+
+	if err = n.addEndpoint(ep); err != nil {
 		return nil, err
 	}
 	defer func() {
 		if err != nil {
-			if e := n.getController().deleteFromStore(ep); e != nil {
-				logrus.Warnf("error rolling back endpoint %s from store: %v", name, e)
+			if e := ep.deleteEndpoint(false); e != nil {
+				logrus.Warnf("cleaning up endpoint failed %s : %v", name, e)
 			}
 		}
 	}()
 
-	if err = n.addEndpoint(ep); err != nil {
+	// We should perform updateToStore call right after addEndpoint
+	// in order to have iface properly configured
+	if err = n.getController().updateToStore(ep); err != nil {
 		return nil, err
 	}
 	defer func() {
 		if err != nil {
-			if e := ep.deleteEndpoint(false); e != nil {
-				logrus.Warnf("cleaning up endpoint failed %s : %v", name, e)
+			if e := n.getController().deleteFromStore(ep); e != nil {
+				logrus.Warnf("error rolling back endpoint %s from store: %v", name, e)
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -1156,26 +1156,27 @@ func (n *network) createEndpoint(name string, options ...EndpointOption) (Endpoi`
`1156`	`1156`	`ep.releaseAddress()`
`1157`	`1157`	`}`
`1158`	`1158`	`}()`
`1159`		`- // Moving updateToSTore before calling addEndpoint so that we shall clean up VETH interfaces in case`
`1160`		`- // DockerD get killed between addEndpoint and updateSTore call`
`1161`		`- if err = n.getController().updateToStore(ep); err != nil {`
	`1159`	`+`
	`1160`	`+ if err = n.addEndpoint(ep); err != nil {`
`1162`	`1161`	`return nil, err`
`1163`	`1162`	`}`
`1164`	`1163`	`defer func() {`
`1165`	`1164`	`if err != nil {`
`1166`		`- if e := n.getController().deleteFromStore(ep); e != nil {`
`1167`		`- logrus.Warnf("error rolling back endpoint %s from store: %v", name, e)`
	`1165`	`+ if e := ep.deleteEndpoint(false); e != nil {`
	`1166`	`+ logrus.Warnf("cleaning up endpoint failed %s : %v", name, e)`
`1168`	`1167`	`}`
`1169`	`1168`	`}`
`1170`	`1169`	`}()`
`1171`	`1170`
`1172`		`- if err = n.addEndpoint(ep); err != nil {`
	`1171`	`+ // We should perform updateToStore call right after addEndpoint`
	`1172`	`+ // in order to have iface properly configured`
	`1173`	`+ if err = n.getController().updateToStore(ep); err != nil {`
`1173`	`1174`	`return nil, err`
`1174`	`1175`	`}`
`1175`	`1176`	`defer func() {`
`1176`	`1177`	`if err != nil {`
`1177`		`- if e := ep.deleteEndpoint(false); e != nil {`
`1178`		`- logrus.Warnf("cleaning up endpoint failed %s : %v", name, e)`
	`1178`	`+ if e := n.getController().deleteFromStore(ep); e != nil {`
	`1179`	`+ logrus.Warnf("error rolling back endpoint %s from store: %v", name, e)`
`1179`	`1180`	`}`
`1180`	`1181`	`}`
`1181`	`1182`	`}()`