InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51064 from thaJeztah/28.x_backport_fix_epcnt_warning

Browse Source 
[28.x backport] Eliminate warning about endpoint count store delete
This commit is contained in:
Sebastiaan van Stijn
2025-09-29 17:21:26 +02:00
committed by GitHub
parent 252a1ebe7e fbf2fe8b7d
commit 423a7fd6af
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libnetwork/network.go
View File

@@ -1115,18 +1115,17 @@ func (n *Network) delete(force bool, rmLBEndpoint bool) error {
}
removeFromStore:
// deleteFromStore performs an atomic delete operation and the
// Network.epCnt will help prevent any possible
// race between endpoint join and network delete
//
// TODO(robmry) - remove this once downgrade past 28.1.0 is no longer supported.
// The endpoint count is no longer used, it's created in the store to make
// downgrade work, versions older than 28.1.0 expect to read it and error if they
// can't. The stored count is not maintained, so the downgraded version will
// always find it's zero (which is usually correct because the daemon had
// stopped), but older daemons fix it on startup anyway.
if err = c.deleteFromStore(&endpointCnt{n: n}); err != nil {
log.G(context.TODO()).Debugf("Error deleting endpoint count from store for stale network %s (%s) for deletion: %v", n.Name(), n.ID(), err)
// can't.
if err := c.store.DeleteObject(&endpointCnt{n: n}); err != nil {
if !errors.Is(err, datastore.ErrKeyNotFound) {
log.G(context.TODO()).WithFields(log.Fields{
"network": n.name,
"error": err,
}).Debug("Error deleting network endpoint count from store")
}
}
if err = c.deleteStoredNetwork(n); err != nil {