arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-02-17 18:42:00 +00:00
Code Issues Releases Wiki Activity

Lock for controller or compute

Browse Source
This commit is contained in:
Julien Duponchelle 2016-04-14 12:15:45 +02:00
parent 2055cdea5e
commit 2841b5769e
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gns3server/web/route.py
View File

@ -242,16 +242,23 @@ class Route(object):
vm_id = request.match_info.get("vm_id") vm_id = request.match_info.get("vm_id")
if vm_id is None: if vm_id is None:
vm_id = request.match_info["device_id"] vm_id = request.match_info["device_id"]
cls._vm_locks.setdefault(vm_id, {"lock": asyncio.Lock(), "concurrency": 0})
cls._vm_locks[vm_id]["concurrency"] += 1
with (yield from cls._vm_locks[vm_id]["lock"]): if "controller" in request.path:
type = "controller"
else:
type = "compute"
lock_key = "{}:{}:{}".format(type, request.match_info["project_id"], vm_id)
cls._vm_locks.setdefault(lock_key, {"lock": asyncio.Lock(), "concurrency": 0})
cls._vm_locks[lock_key]["concurrency"] += 1
with (yield from cls._vm_locks[lock_key]["lock"]):
response = yield from control_schema(request) response = yield from control_schema(request)
cls._vm_locks[vm_id]["concurrency"] -= 1 cls._vm_locks[lock_key]["concurrency"] -= 1
# No more waiting requests, garbage collect the lock # No more waiting requests, garbage collect the lock
if cls._vm_locks[vm_id]["concurrency"] <= 0: if cls._vm_locks[lock_key]["concurrency"] <= 0:
del cls._vm_locks[vm_id] del cls._vm_locks[lock_key]
else: else:
response = yield from control_schema(request) response = yield from control_schema(request)
return response return response