arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Parallel execution when closing VMs.

Browse Source
This commit is contained in:
Jeremy 2015-02-05 14:24:06 -07:00
parent f2ff933b20
commit 8118d7762f
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gns3server/modules/base_manager.py
View File

@ -97,12 +97,18 @@ class BaseManager:
@asyncio.coroutine @asyncio.coroutine
def unload(self): def unload(self):
tasks = []
for vm_id in self._vms.keys(): for vm_id in self._vms.keys():
try: tasks.append(asyncio.async(self.close_vm(vm_id)))
yield from self.close_vm(vm_id)
except Exception as e: if tasks:
log.error("Could not delete VM {}: {}".format(vm_id, e), exc_info=1) done, _ = yield from asyncio.wait(tasks)
continue for future in done:
try:
future.result()
except Exception as e:
log.error("Could not close VM {}".format(e), exc_info=1)
continue
if hasattr(BaseManager, "_instance"): if hasattr(BaseManager, "_instance"):
BaseManager._instance = None BaseManager._instance = None

12
gns3server/modules/project.py
View File

@ -243,11 +243,21 @@ class Project:
:param cleanup: If True drop the project directory :param cleanup: If True drop the project directory
""" """
tasks = []
for vm in self._vms: for vm in self._vms:
if asyncio.iscoroutinefunction(vm.close): if asyncio.iscoroutinefunction(vm.close):
yield from vm.close() tasks.append(asyncio.async(vm.close()))
else: else:
vm.close() vm.close()
if tasks:
done, _ = yield from asyncio.wait(tasks)
for future in done:
try:
future.result()
except Exception as e:
log.error("Could not close VM {}".format(e), exc_info=1)
if cleanup and os.path.exists(self.path): if cleanup and os.path.exists(self.path):
try: try:
yield from wait_run_in_executor(shutil.rmtree, self.path) yield from wait_run_in_executor(shutil.rmtree, self.path)