almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

lorax-composer: Check for STATUS before deleting

Browse Source 
When there is no run or new symlink do one last check to make sure no
STATUS file was written. If it is missing, go ahead and remove the
results directory.

Related: rhbz#1656691
This commit is contained in:
Brian C. Lane 2018-12-10 10:27:14 -08:00
parent fa461dc837
commit 3762264f56
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pylorax/api/queue.py
View File

@ -437,7 +437,7 @@ def uuid_cancel(cfg, uuid):
# It can move from WAITING -> RUNNING or it can move from RUNNING -> FINISHED|FAILED # It can move from WAITING -> RUNNING or it can move from RUNNING -> FINISHED|FAILED
# If it is in WAITING remove the symlink and then check to make sure it didn't show up # If it is in WAITING remove the symlink and then check to make sure it didn't show up
# in RUNNING # in the run queue
queue_dir = joinpaths(cfg.get("composer", "lib_dir"), "queue") queue_dir = joinpaths(cfg.get("composer", "lib_dir"), "queue")
uuid_new = joinpaths(queue_dir, "new", uuid) uuid_new = joinpaths(queue_dir, "new", uuid)
if os.path.exists(uuid_new): if os.path.exists(uuid_new):
@ -448,10 +448,13 @@ def uuid_cancel(cfg, uuid):
pass pass
uuid_run = joinpaths(queue_dir, "run", uuid) uuid_run = joinpaths(queue_dir, "run", uuid)
if not os.path.exists(uuid_run): if not os.path.exists(uuid_run):
# Successfully removed it before the build started # Make sure the build is still in the waiting state
return uuid_delete(cfg, uuid) status = uuid_status(cfg, uuid)
if status is None or status["queue_status"] == "WAITING":
# Successfully removed it before the build started
return uuid_delete(cfg, uuid)
# Tell the build to stop running # At this point the build has probably started. Write to the CANCEL file.
open(cancel_path, "w").write("\n") open(cancel_path, "w").write("\n")
# Wait for status to move to FAILED or FINISHED # Wait for status to move to FAILED or FINISHED
@ -461,6 +464,7 @@ def uuid_cancel(cfg, uuid):
if status is None or status["queue_status"] == "FAILED": if status is None or status["queue_status"] == "FAILED":
break break
elif status is not None and status["queue_status"] == "FINISHED": elif status is not None and status["queue_status"] == "FINISHED":
# The build finished successfully, no point in deleting it now
return False return False
# Is this taking too long? Exit anyway and try to cleanup. # Is this taking too long? Exit anyway and try to cleanup.