Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions dpdispatcher/submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,12 @@ def handle_unexpected_job_state(self):
if ( self.fail_count ) > 0 and ( self.fail_count % 3 == 0 ) :
raise RuntimeError(f"job:{self.job_hash} {self.job_id} failed {self.fail_count} times.job_detail:{self}")
self.submit_job()
dlog.info("job:{job_hash} re-submit after terminated; new job_id is {job_id}".format(job_hash=self.job_hash, job_id=self.job_id))
time.sleep(0.2)
self.get_job_state()
dlog.info(f"job:{self.job_hash} job_id:{self.job_id} after re-submitting; the state now is {repr(self.job_state)}")
self.handle_unexpected_job_state()
if self.job_state != JobStatus.unsubmitted:
dlog.info("job:{job_hash} re-submit after terminated; new job_id is {job_id}".format(job_hash=self.job_hash, job_id=self.job_id))
time.sleep(0.2)
self.get_job_state()
dlog.info(f"job:{self.job_hash} job_id:{self.job_id} after re-submitting; the state now is {repr(self.job_state)}")
self.handle_unexpected_job_state()

if job_state == JobStatus.unsubmitted:
dlog.debug(f"job: {self.job_hash} unsubmitted; submit it")
Expand Down Expand Up @@ -610,8 +611,8 @@ def register_job_id(self, job_id):

def submit_job(self):
job_id = self.machine.do_submit(self)
self.register_job_id(job_id)
if job_id:
self.register_job_id(job_id)
self.job_state = JobStatus.waiting
else:
self.job_state = JobStatus.unsubmitted
Expand Down