浏览代码

Ignoring Driver failure on Leave.

After some delibration, we think it is better not to hold onto the
sandbox resources if an explicit call to Leave fails by the Driver.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Madhu Venugopal 10 年之前
父节点
当前提交
95c5eb2856
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      libnetwork/endpoint.go

+ 1 - 5
libnetwork/endpoint.go

@@ -213,14 +213,10 @@ func (ep *endpoint) Leave(containerID string, options ...EndpointOption) error {
 
 	n := ep.network
 	err := n.driver.Leave(n.id, ep.id, ep.context)
-	if err != nil {
-		return err
-	}
-
 	ep.network.ctrlr.sandboxRm(ep.container.data.SandboxKey)
 	ep.container = nil
 	ep.context = nil
-	return nil
+	return err
 }
 
 func (ep *endpoint) Delete() error {