PP-1095: starting "pbs_mom -p" with running job results in SIGSEGV

openpbs · Nov 22, 2017 · 4494144 · 4494144
1 parent 1724245
commit 4494144
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/resmom/catch_child.c b/src/resmom/catch_child.c
@@ -2248,6 +2248,10 @@ init_abort_jobs(int recover)
 				ti_jobtask)) {
 				ptask->ti_flags |= TI_FLAGS_ORPHAN;
 			}
+
+			if (pj->ji_qs.ji_substate == JOB_SUBSTATE_RUNNING)
+				start_walltime(pj);
+
 			if (mom_do_poll(pj))
 				append_link(&mom_polljobs, &pj->ji_jobque, pj);
 		}

diff --git a/src/resmom/mom_main.c b/src/resmom/mom_main.c
@@ -6982,7 +6982,7 @@ mom_over_limit(job *pjob)
 				svr_resc_size);
 			assert(rd != NULL);
 			preswalltime = find_resc_entry(at, rd);
-			assert(rd != NULL);
+			assert(preswalltime != NULL);
 			walltime_sum = preswalltime->rs_value.at_val.at_long;
 			if (walltime_sum > average_trialperiod) {
 				rd = find_resc_def(svr_resc_def, "cput",