Просмотр исходного кода

Merge pull request #1686 from aboch/sta

Remove enpoint state from cluster on join failure
Santhosh Manohar 8 лет назад
Родитель
Сommit
1f32a0a772
1 измененных файлов с 8 добавлено и 0 удалено
  1. 8 0
      libnetwork/endpoint.go

+ 8 - 0
libnetwork/endpoint.go

@@ -519,6 +519,14 @@ func (ep *endpoint) sbJoin(sb *sandbox, options ...EndpointOption) error {
 		return err
 		return err
 	}
 	}
 
 
+	defer func() {
+		if err != nil {
+			if e := ep.deleteDriverInfoFromCluster(); e != nil {
+				logrus.Errorf("Could not delete endpoint state for endpoint %s from cluster on join failure: %v", ep.Name(), e)
+			}
+		}
+	}()
+
 	if sb.needDefaultGW() && sb.getEndpointInGWNetwork() == nil {
 	if sb.needDefaultGW() && sb.getEndpointInGWNetwork() == nil {
 		return sb.setupDefaultGW()
 		return sb.setupDefaultGW()
 	}
 	}