External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-08 21:19:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

check EACCES and only refresh cancel_flag

Browse Source
This commit is contained in:
Wayne Witzel III
2018-05-18 14:00:33 -04:00
parent 5279b102cb
commit 9fe44cfaae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -1672,14 +1672,14 @@ class RunProjectUpdate(BaseTask):
start_time = time.time() start_time = time.time()
while True: while True:
try: try:
instance.refresh_from_db() instance.refresh_from_db(fields=['cancel_flag'])
if instance.cancel_flag: if instance.cancel_flag:
logger.info(six.text_type("ProjectUpdate({0}) was cancelled".format(instance.pk))) logger.info(six.text_type("ProjectUpdate({0}) was cancelled".format(instance.pk)))
return return
fcntl.flock(self.lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) fcntl.flock(self.lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
break break
except IOError as e: except IOError as e:
if e.errno != errno.EAGAIN: if e.errno not in (errno.EAGAIN, errno.EACCES):
os.close(self.lock_fd) os.close(self.lock_fd)
logger.error(six.text_type("I/O error({0}) while trying to aquire lock on file [{1}]: {2}").format(e.errno, lock_path, e.strerror)) logger.error(six.text_type("I/O error({0}) while trying to aquire lock on file [{1}]: {2}").format(e.errno, lock_path, e.strerror))
raise raise