JDierkse/Docker-Net-DHCP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deadlock upon Docker Startup

Browse Source
This commit is contained in:
JDierkse
2021-03-03 22:44:38 +01:00
parent 0ada35f550
commit 54b1240478
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net-dhcp/network.py
+4 -1
View File
@@ -250,11 +250,14 @@ def endpoint_info():
def delete_endpoint(): def delete_endpoint():
req = request.get_json(force=True) req = request.get_json(force=True)
bridge = net_bridge(req['NetworkID'])
if_host, _if_container = veth_pair(req['EndpointID']) if_host, _if_container = veth_pair(req['EndpointID'])
if_host = interface.GetInterface(LIBRARY, if_host) if_host = interface.GetInterface(LIBRARY, if_host)
if library == 'NDB':
bridge = net_bridge(req['NetworkID'])
interface.DelPort(LIBRARY, bridge.ifname, if_host.ifname) interface.DelPort(LIBRARY, bridge.ifname, if_host.ifname)
else:
interface.DelPort(LIBRARY, 'dummy0', if_host.ifname)
interface.RemoveInterface(LIBRARY, if_host.ifname) interface.RemoveInterface(LIBRARY, if_host.ifname)
return jsonify({}) return jsonify({})