Merge pull request #440 from brianhlin/HTCONDOR-350.v4.walltime-fix

SYSTEM_PERIODIC_REMOVE walltime fixes for HTCondor-CE 4 (HTCONDOR-350)
htcondor · Mar 26, 2021 · 844cc07 · 844cc07
2 parents 458678d + 8a3d0db
commit 844cc07
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/config/01-ce-router-defaults.conf.in b/config/01-ce-router-defaults.conf.in
@@ -62,11 +62,11 @@ REMOVE_REASON_3 = strcat("job completed over ", $(COMPLETED_JOB_EXPIRATION), " d
 # Remove jobs that have exceeded configured or requested max wall time
 REMOVE_CLAUSE_4 = (JobUniverse == 5 && \
                    JobStatus == 2 && \
-                   time() - JobCurrentStartExecutingDate > \
-                       maxWalltime is undefined ? $(ROUTED_JOB_MAX_TIME)*60 : maxWalltime*60 )
+                   (time() - JobCurrentStartDate) > \
+                       (maxWalltime is undefined ? $(ROUTED_JOB_MAX_TIME)*60 : maxWalltime*60) )
 REMOVE_REASON_4 = strcat("job exceeded allowed walltime: ", \
                          maxWalltime is undefined ? $(ROUTED_JOB_MAX_TIME)*60 : maxWalltime*60, \
-                         "min")
+                         " minutes.")
 
 SYSTEM_PERIODIC_REMOVE =  $(REMOVE_CLAUSE_1) || \
                           $(REMOVE_CLAUSE_2) || \