From df68861874b0abff18f634768cd823dbaf9be20b Mon Sep 17 00:00:00 2001
From: JAMES LETTS <jletts@ucsd.edu>
Date: Wed, 30 Apr 2014 17:15:13 -0700
Subject: [PATCH] Updated.

---
 condor_check              |  3 +++
 condor_functions.sh       |  2 ++
 condor_history_analyze.sh | 30 ++++++++----------------------
 debug.sh                  | 26 ++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100755 debug.sh

diff --git a/condor_check b/condor_check
index 416cab9..3ffc7ec 100755
--- a/condor_check
+++ b/condor_check
@@ -13,9 +13,12 @@ if [ "X"$SHORT == "X" ] ; then SHORT="long" ; fi
 
 # Header
 echo Summary Table for glidinWMS pool $POOLNAME at `/bin/date -u`
+echo
+
 # Summary Table from the Collector
 condor_status -pool $POOLNAME -schedd || exit 2
 echo
+
 # Last Negotiation Cycle time
 negotime=`condor_status -pool $POOLNAME -nego -l | grep LastNegotiationCycleDuration0 | awk '{print $3}'` || exit 3
 echo "Negotiation time = ${negotime}s"
diff --git a/condor_functions.sh b/condor_functions.sh
index 2d8c738..70fc01f 100644
--- a/condor_functions.sh
+++ b/condor_functions.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# BUG: -const '(CurrentTime-EnteredCurrentStatus<86400)' is being ignored!
+
 getClassAds() {
   # Function to dump a set of ClassAds for queued, running and jobs 
   # from the past 24h of condor history. If the command fails remotely,
diff --git a/condor_history_analyze.sh b/condor_history_analyze.sh
index 3979601..68655e8 100755
--- a/condor_history_analyze.sh
+++ b/condor_history_analyze.sh
@@ -17,22 +17,7 @@ FILE=$glideinWMSMonitor_OUTPUT_DIR/`ls -1rt /crabprod/CSstoragePath/Monitor \
   | grep ^monitor-anaops-history | grep \.txt$ | tail -1`
 NOW=`ls -l --time-style=+%s $FILE | awk '{print $6}'`
 
-cat <<EOF
-HISTORY FILE: $FILE
-
-SCHEDDS CONSIDERED IN THE HISTORY:
-
- Queued
-   Jobs Schedd Name
-EOF
-grep '^JobStatus=[125]' $FILE | grep -o GlobalJobId=.* | awk -F\= '{print $2}' | awk -F\# '{print $1}' | sort | uniq -c 
-cat <<EOF
-
-   Done
-   Jobs Schedd Name
-EOF
-grep '^JobStatus=[34]' $FILE | grep -o GlobalJobId=.* | awk -F\= '{print $2}' | awk -F\# '{print $1}' | sort | uniq -c 
-echo
+echo HISTORY FILE: $FILE
 echo
 
 nabort=`grep "^JobStatus=3" $FILE                           | wc -l`
@@ -227,13 +212,14 @@ END {
 }
 ' | grep ^T | sort
 
-exit
 
-echo
-echo
-echo USER PRIORITIES:
-echo
+$glideinWMSMonitor_RELEASE_DIR/debug.sh
+
+#echo
+#echo
+#echo USER PRIORITIES:
+#echo
+#condor_userprio -all -pool $POOLNAME
 #condor_userprio -allusers -all -pool $POOLNAME
-condor_userprio -all -pool $POOLNAME
 
 exit
diff --git a/debug.sh b/debug.sh
new file mode 100755
index 0000000..dda1432
--- /dev/null
+++ b/debug.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+count_entries_in_history_file() {
+  STATUS=$1
+  TITLE=$2
+  echo
+  echo $TITLE
+  printf "%-35s   %-35s  %15s\n" "schedd Name" "Earliest Entry" "Number of Jobs"
+  #SCHEDDS=`cat $FILE | awk -F\= '{print $NF}' | awk -F\# '{print $1}' | sort | uniq | sort`
+  SCHEDDS=`condor_status -schedd -format '%s\n' Name`
+  for SCHEDD in $SCHEDDS ; do
+    grep ^JobStatus=$STATUS $FILE | grep $SCHEDD | grep -o 'EnteredCurrentStatus=[0-9]*' \
+      | awk -F\= -v now=`/bin/date +%s` -v schedd=$SCHEDD \
+      'BEGIN{x=now;n=0}{if($2<x){x=$2};n+=1}END{printf("%-35s   %-35s  %15i\n",schedd,strftime("%c",x),n)}' 
+  done
+}
+
+echo
+echo "====================================== BEGIN DEBUG ======================================="
+count_entries_in_history_file 4 "COMPLETED JOBS:"
+count_entries_in_history_file 3 "REMOVED JOBS:"
+count_entries_in_history_file 5 "HELD JOBS:"
+echo "======================================= END DEBUG ========================================"
+echo
+
+exit