Merge pull request #426 from drebatto/master

Use GlobalJobId as unique job identifier
htcondor · Feb 18, 2021 · 458678d · 458678d
2 parents 1b3cec2 + b6dfd41
commit 458678d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/contrib/apelscripts/condor_batch.sh b/contrib/apelscripts/condor_batch.sh
@@ -32,8 +32,7 @@ safe_config_val SCALING_ATTR APEL_SCALING_ATTR
 safe_config_val BATCH_HOST APEL_BATCH_HOST
 
 TZ=GMT condor_history -constraint "$CONSTR" \
-    -format "%s" clusterId \
-    -format ".%s_${BATCH_HOST}|" ProcId \
+    -format "%s|" GlobalJobId \
     -format "%s|" Owner \
     -format "%d|" RemoteWallClockTime \
     -format "%d|" RemoteUserCpu \

diff --git a/contrib/apelscripts/condor_blah.sh b/contrib/apelscripts/condor_blah.sh
@@ -39,7 +39,6 @@ TZ=GMT condor_history -const "$CONSTR" \
  -format "\"userFQAN=%s\" " x509UserProxyFirstFQAN \
  -format "\"ceID=${CE_ID}\" " EMPTY \
  -format "\"jobID=%v_${CE_HOST}\" " RoutedFromJobId \
- -format "\"lrmsID=%v" clusterId \
- -format ".%v_${BATCH_HOST}\" " ProcId \
+ -format "\"lrmsID=%s\" " GlobalJobId \
  -format "\"localUser=%s\"\n"  Owner  > $OUTPUT_FILE