anti/DECNET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(network): reuse existing decnet_lan when active deckies are connected

Browse Source 
Docker refuses network removal (403) when containers hold endpoints.
The old IPAM-drift path tried to disconnect+remove even with live
containers — disconnect silently failed, remove raised APIError.

Since DECNET assigns IPs explicitly in compose (never via Docker's
auto-assign pool), an ip_range mismatch on an existing same-driver
network is harmless. Bail out early and attach to the existing network
whenever Containers is non-empty.
This commit is contained in:
anti
2026-05-10 00:50:41 -04:00
parent 92632d7afd
commit 251181255b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
decnet/network.py
View File

@@ -155,7 +155,9 @@ def _ensure_network(
# Same driver — but if the IPAM pool drifted (different subnet, # Same driver — but if the IPAM pool drifted (different subnet,
# gateway, or ip-range than this deploy asks for), reusing it # gateway, or ip-range than this deploy asks for), reusing it
# hands out addresses from the old pool and we race the real LAN. # hands out addresses from the old pool and we race the real LAN.
# Compare and rebuild on mismatch. # Compare and rebuild on mismatch — but only when no containers
# are attached. With active endpoints Docker refuses the remove
# with 403; just attach to the existing network instead.
pools = (net.attrs.get("IPAM") or {}).get("Config") or [] pools = (net.attrs.get("IPAM") or {}).get("Config") or []
cur = pools[0] if pools else {} cur = pools[0] if pools else {}
if ( if (
@@ -164,8 +166,15 @@ def _ensure_network(
and cur.get("IPRange") == ip_range and cur.get("IPRange") == ip_range
): ):
return # right driver AND matching pool, leave it alone return # right driver AND matching pool, leave it alone
# Driver mismatch OR IPAM drift — tear it down. Disconnect any live if net.attrs.get("Containers"):
# containers first so `remove()` doesn't refuse with ErrNetworkInUse. # Active endpoints — can't safely rebuild. Attach to the
# existing network; IPAM drift on ip_range only affects
# Docker's auto-assign pool, which DECNET doesn't use
# (IPs are always set explicitly in the compose file).
return
# Driver mismatch OR empty-endpoint IPAM drift — tear it down.
# Disconnect any live containers first so `remove()` doesn't
# refuse with ErrNetworkInUse.
for cid in (net.attrs.get("Containers") or {}): for cid in (net.attrs.get("Containers") or {}):
try: try:
net.disconnect(cid, force=True) net.disconnect(cid, force=True)