From 54b1240478392aaffd20fbc42b858c1e6dc52bdf Mon Sep 17 00:00:00 2001 From: JDierkse Date: Wed, 3 Mar 2021 22:44:38 +0100 Subject: [PATCH] Fix deadlock upon Docker Startup --- net-dhcp/network.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net-dhcp/network.py b/net-dhcp/network.py index 8f52fff..cc1b5e5 100644 --- a/net-dhcp/network.py +++ b/net-dhcp/network.py @@ -250,11 +250,14 @@ def endpoint_info(): def delete_endpoint(): req = request.get_json(force=True) - bridge = net_bridge(req['NetworkID']) if_host, _if_container = veth_pair(req['EndpointID']) if_host = interface.GetInterface(LIBRARY, if_host) - interface.DelPort(LIBRARY, bridge.ifname, if_host.ifname) + if library == 'NDB': + bridge = net_bridge(req['NetworkID']) + interface.DelPort(LIBRARY, bridge.ifname, if_host.ifname) + else: + interface.DelPort(LIBRARY, 'dummy0', if_host.ifname) interface.RemoveInterface(LIBRARY, if_host.ifname) return jsonify({})