|
@@ -1156,26 +1156,27 @@ func (n *network) createEndpoint(name string, options ...EndpointOption) (Endpoi
|
|
ep.releaseAddress()
|
|
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
|
|
return nil, err
|
|
}
|
|
}
|
|
defer func() {
|
|
defer func() {
|
|
if err != nil {
|
|
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
|
|
return nil, err
|
|
}
|
|
}
|
|
defer func() {
|
|
defer func() {
|
|
if err != nil {
|
|
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)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}()
|
|
}()
|