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

Fix some race condition in project deletion

Browse Source 
Fix #866
This commit is contained in:
Julien Duponchelle 2017-01-17 19:37:38 +01:00
parent d10e707f4f
commit c9f3ea4489
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/compute/project.py
View File

@ -57,7 +57,7 @@ class Project:
else: else:
project_id = str(uuid4()) project_id = str(uuid4())
self._id = project_id self._id = project_id
self._deleted = False
self._nodes = set() self._nodes = set()
self._used_tcp_ports = set() self._used_tcp_ports = set()
self._used_udp_ports = set() self._used_udp_ports = set()
@ -181,6 +181,7 @@ class Project:
""" """
workdir = self.module_working_path(module_name) workdir = self.module_working_path(module_name)
if not self._deleted:
try: try:
os.makedirs(workdir, exist_ok=True) os.makedirs(workdir, exist_ok=True)
except OSError as e: except OSError as e:
@ -207,6 +208,7 @@ class Project:
""" """
workdir = os.path.join(self._path, "project-files", node.manager.module_name.lower(), node.id) workdir = os.path.join(self._path, "project-files", node.manager.module_name.lower(), node.id)
if not self._deleted:
try: try:
os.makedirs(workdir, exist_ok=True) os.makedirs(workdir, exist_ok=True)
except OSError as e: except OSError as e:
@ -227,6 +229,7 @@ class Project:
""" """
workdir = os.path.join(self._path, "tmp", "captures") workdir = os.path.join(self._path, "tmp", "captures")
if not self._deleted:
try: try:
os.makedirs(workdir, exist_ok=True) os.makedirs(workdir, exist_ok=True)
except OSError as e: except OSError as e:
@ -324,6 +327,7 @@ class Project:
log.error("Could not close node {}".format(e), exc_info=1) log.error("Could not close node {}".format(e), exc_info=1)
if cleanup and os.path.exists(self.path): if cleanup and os.path.exists(self.path):
self._deleted = True
try: try:
yield from wait_run_in_executor(shutil.rmtree, self.path) yield from wait_run_in_executor(shutil.rmtree, self.path)
log.info("Project {id} with path '{path}' deleted".format(path=self._path, id=self._id)) log.info("Project {id} with path '{path}' deleted".format(path=self._path, id=self._id))