From 0c8ffda2ab1841dc561d4f35897ec9f1b5eeb8e7 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 --- libnetwork/network.go | 3 ++- libnetwork/store.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libnetwork/network.go b/libnetwork/network.go index 1f79577395..a7a6d0748b 100644 --- a/libnetwork/network.go +++ b/libnetwork/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/libnetwork/store.go b/libnetwork/store.go index 84507c5b4e..1b850104e9 100644 --- a/libnetwork/store.go +++ b/libnetwork/store.go @@ -85,7 +85,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) {