diff --git a/backport-Fix-failed-to-get-network-during-CreateEndpoint.patch b/backport-Fix-failed-to-get-network-during-CreateEndpoint.patch new file mode 100644 index 0000000000000000000000000000000000000000..caef561d0cd94fb8aed8c4dc30188a8784f4d69a --- /dev/null +++ b/backport-Fix-failed-to-get-network-during-CreateEndpoint.patch @@ -0,0 +1,44 @@ +From 1df7f7e6d1e809362b16aba8893675ef81b1b9ab 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 +--- + network.go | 3 ++- + store.go | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9/network.go libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9-b/network.go +index 5ca660c..657c5ee 100644 +--- libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9/network.go ++++ libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9-b/network.go +@@ -1166,7 +1166,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 libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9/store.go libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9-b/store.go +index 0a7c575..27f89e9 100644 +--- libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9/store.go ++++ libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9-b/store.go +@@ -104,7 +104,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) { +-- +2.9.3.windows.1 + diff --git a/libnetwork.spec b/libnetwork.spec index d426d708eb5e923aa76aa5942cbdb6a581a79783..337d0f85cd6810c523a3b16ba98a0fdf4cf9b455 100644 --- a/libnetwork.spec +++ b/libnetwork.spec @@ -1,11 +1,14 @@ %define debug_package %{nil} Name: libnetwork Version: 0.8.0.dev.2 -Release: 104 +Release: 105 Summary: Proxy used for docker port mapping License: Apache License 2.0 URL: https://github.com/docker/libnetwork Source: libnetwork-d00ceed.tar.gz + +Patch1: backport-Fix-failed-to-get-network-during-CreateEndpoint.patch + BuildRequires: golang >= 1.8.3 BuildRequires: make Provides: docker-proxy @@ -15,6 +18,7 @@ Obsoletes: docker-proxy %prep %setup -c -n libnetwork +%patch1 -p0 %build cd libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9 @@ -48,6 +52,9 @@ install -p -m 755 libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9/docker-pro %{_bindir}/docker-proxy %changelog +* Thu Jul 18 2024 guojunding - 0.8.0.dev.2-105 +- Fix 'failed to get network during CreateEndpoint' + * Mon Aug 14 2023 suwei - 0.8.0.dev.2-104 - Type:enhencement - Id:NA