From bcb6dd6d252167a714e316270eaa7dc68ae739c8 Mon Sep 17 00:00:00 2001 From: Xinfeng Liu Date: Fri, 22 May 2020 15:22:36 +0800 Subject: [PATCH] Fix 'failed to get network during CreateEndpoint' Fix 'failed to get network during CreateEndpoint' during container starting. Change the error type to `libnetwork.ErrNoSuchNetwork`, so `Start()` in `daemon/cluster/executor/container/controller.go` will recreate the network. Signed-off-by: Xinfeng Liu (cherry picked from commit 1df7f7e6d1e809362b16aba8893675ef81b1b9ab) Signed-off-by: Shane Jarych --- network.go | 3 ++- store.go | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/network.go b/network.go index 1f79577395..a7a6d0748b 100644 --- a/network.go +++ b/network.go @@ -1181,7 +1181,8 @@ func (n *network) createEndpoint(name string, options ...EndpointOption) (Endpoi ep.locator = n.getController().clusterHostID() ep.network, err = ep.getNetworkFromStore() if err != nil { - return nil, fmt.Errorf("failed to get network during CreateEndpoint: %v", err) + logrus.Errorf("failed to get network during CreateEndpoint: %v", err) + return nil, err } n = ep.network diff --git a/store.go b/store.go index 0a7c5754d3..76bca0d6fc 100644 --- a/store.go +++ b/store.go @@ -103,8 +103,7 @@ func (c *controller) getNetworkFromStore(nid string) (*network, error) { } return n, nil } - - return nil, fmt.Errorf("network %s not found", nid) + return nil, ErrNoSuchNetwork(nid) } func (c *controller) getNetworksForScope(scope string) ([]*network, error) {