From 0b601ba9618d5be5c644db4e971373ecf67eba67 Mon Sep 17 00:00:00 2001 From: JAMES LETTS Date: Wed, 30 Apr 2014 17:22:45 -0700 Subject: [PATCH] Updated. --- condor_functions.sh | 8 +++++--- condor_history_analyze.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/condor_functions.sh b/condor_functions.sh index 70fc01f..c947a23 100644 --- a/condor_functions.sh +++ b/condor_functions.sh @@ -15,13 +15,14 @@ getClassAds() { # # Called from condor_history_dump - POOLNAME=$1 ; shift - SCHEDDNAME=$1 ; shift + POOLNAME=$1 ; shift + SCHEDDNAME=$1 ; shift MACHINENAME=$1 ; shift # It is convenient to have JobStatus first to distinguish # it from LastJobStatus. command="$@ \ + -const '(CurrentTime-EnteredCurrentStatus<86400)' \ -format 'JobStatus=%i\ ' JobStatus \ -format 'LastJobStatus=%i\ ' LastJobStatus \ -format 'ExitCode=%i\ ' ExitCode \ @@ -108,7 +109,8 @@ condor_history_dump() { for SCHEDD in $SCHEDDS ; do SCHEDDNAME=` echo $SCHEDD | awk -F\, '{print $1}'` MACHINENAME=`echo $SCHEDD | awk -F\, '{print $2}'` - getClassAds $POOLNAME $SCHEDDNAME $MACHINENAME "condor_history -const '(CurrentTime-EnteredCurrentStatus<86400)'" + #getClassAds $POOLNAME $SCHEDDNAME $MACHINENAME "condor_history -const '(CurrentTime-EnteredCurrentStatus<86400)'" + getClassAds $POOLNAME $SCHEDDNAME $MACHINENAME "condor_history" getClassAds $POOLNAME $SCHEDDNAME $MACHINENAME "condor_q" done return 0 diff --git a/condor_history_analyze.sh b/condor_history_analyze.sh index 68655e8..83553b6 100755 --- a/condor_history_analyze.sh +++ b/condor_history_analyze.sh @@ -213,7 +213,7 @@ END { ' | grep ^T | sort -$glideinWMSMonitor_RELEASE_DIR/debug.sh +#doesnt work $glideinWMSMonitor_RELEASE_DIR/debug.sh #echo #echo