Various updated.

jamesletts · Jan 12, 2015 · 86195b5 · 86195b5
1 parent d1fb616
commit 86195b5
Show file tree

Hide file tree

Showing 10 changed files with 681 additions and 702 deletions.
diff --git a/JobExitCodes b/JobExitCodes
diff --git a/condor_check.sh b/condor_check.sh
@@ -16,26 +16,25 @@ OUTFILE=$glideinWMSMonitor_OUTPUT_DIR/monitor-anaops-`/bin/date +%F-Z%R -u`.txt
 
 cat >> $OUTFILE <<EOF
 
-======================================================= ANAOPS POOL =======================================================
+
+======================================================= GLOBAL POOL =======================================================
 
 EOF
-# run analysis of analysis ops pool, with a time limit of 300s.
-COLLECTOR1=glidein-collector-2.t2.ucsd.edu
-COLLECTOR2=glidein-collector.t2.ucsd.edu
+# run analysis of global pool, with a time limit of 300s.
+COLLECTOR1=vocms097.cern.ch
+COLLECTOR2=vocms099.cern.ch
 alarm 600 $glideinWMSMonitor_RELEASE_DIR/condor_check $COLLECTOR1 $COLLECTOR2 >> $OUTFILE
-rc=$?
 
 cat >> $OUTFILE <<EOF
 
 
-======================================================= GLOBAL POOL =======================================================
+======================================================= GLOBAL POOL ITB ==================================================
 
 EOF
 # run analysis of global pool, with a time limit of 300s.
-COLLECTOR1=vocms097.cern.ch
-COLLECTOR2=vocms099.cern.ch
+COLLECTOR1=vocms056.cern.ch
+COLLECTOR2=unknown
 alarm 600 $glideinWMSMonitor_RELEASE_DIR/condor_check $COLLECTOR1 $COLLECTOR2 >> $OUTFILE
-
 cat >> $OUTFILE <<EOF
 
 
@@ -44,8 +43,8 @@ cat >> $OUTFILE <<EOF
 EOF
 COLLECTOR1=vocms97.cern.ch
 COLLECTOR2=unknown
-alarm 600 $glideinWMSMonitor_RELEASE_DIR/condor_check $COLLECTOR1 $COLLECTOR2 short >> $OUTFILE
-#alarm 600 $glideinWMSMonitor_RELEASE_DIR/condor_check $COLLECTOR1 $COLLECTOR2 >> $OUTFILE
+#alarm 600 $glideinWMSMonitor_RELEASE_DIR/condor_check $COLLECTOR1 $COLLECTOR2 short >> $OUTFILE
+alarm 600 $glideinWMSMonitor_RELEASE_DIR/condor_check $COLLECTOR1 $COLLECTOR2 >> $OUTFILE
 
 #if [ $rc -eq 0 ] ; then
   LINKNAME=$glideinWMSMonitor_OUTPUT_DIR/latest.txt

diff --git a/condor_history_dump.sh b/condor_history_dump.sh
@@ -27,10 +27,10 @@ $glideinWMSMonitor_RELEASE_DIR/condor_history_analyze.sh $POOLNAME > ${OUTFILE}.
 mv ${OUTFILE}.tmp $OUTFILE
 
 
-POOLNAME="glidein-collector-2.t2.ucsd.edu"
-OUTFILE=$glideinWMSMonitor_OUTPUT_DIR/latest-overflow.txt
-$glideinWMSMonitor_RELEASE_DIR/condor_history_analyze_overflow.sh $POOLNAME > ${OUTFILE}.tmp
-mv ${OUTFILE}.tmp $OUTFILE
+#POOLNAME="glidein-collector-2.t2.ucsd.edu"
+#OUTFILE=$glideinWMSMonitor_OUTPUT_DIR/latest-overflow.txt
+#$glideinWMSMonitor_RELEASE_DIR/condor_history_analyze_overflow.sh $POOLNAME > ${OUTFILE}.tmp
+#mv ${OUTFILE}.tmp $OUTFILE
 
 POOLNAME="vocms097.cern.ch"
 OUTFILE=$glideinWMSMonitor_OUTPUT_DIR/latest-global-history.txt

diff --git a/dev/condor_functions.sh b/dev/condor_functions.sh