From d2a4a6fa40c546d39617c22c8e67f21121a7ac88 Mon Sep 17 00:00:00 2001 From: tlatorre Date: Wed, 14 Oct 2020 12:33:40 -0500 Subject: fix bug in submit-grid-jobs-queue This commit fixes a typo in submit-grid-jobs-queue by fixing get_job() -> get_entry(). I also decided not to remove held jobs for now, because it's easier for me to see how many are held when running condor_q. --- utils/submit-grid-jobs-queue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/submit-grid-jobs-queue b/utils/submit-grid-jobs-queue index 54af499..9607ed0 100755 --- a/utils/submit-grid-jobs-queue +++ b/utils/submit-grid-jobs-queue @@ -153,7 +153,7 @@ def remove_job(row): Remove a particular job from the job queue. Returns 0 on success, -1 on failure. """ - entry = get_job(row) + entry = get_entry(row) if entry == -1: return -1 @@ -198,7 +198,7 @@ def release_job(row): """ Release a particular job. Returns 0 on success, -1 on failure. """ - entry = get_job(row) + entry = get_entry(row) if entry == -1: return -1 @@ -325,9 +325,9 @@ def main(conn): log.notice("Job %i completed successfully!" % id) c.execute("UPDATE state SET state = 'SUCCESS' WHERE id = ?", (id,)) elif job_status == 5: - # For now, I just mark held jobs as failed - remove_job(row) - c.execute("UPDATE state SET state = 'FAILED', message = ? WHERE id = ?", ("job was held",id)) + # For now, I don't do anything for held jobs. I can mark them + # manually as failed or retry in the database. + pass elif job_status == 7: c.execute("UPDATE state SET state = 'FAILED', message = ? WHERE id = ?", ("job failed", id)) else: -- cgit