[Swift-commit] r5791 - in trunk/bin: . grid

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-05-22 10:25:28 -0500 (Tue, 22 May 2012)
New Revision: 5791

Modified:
   trunk/bin/grid/run-worker.sh
   trunk/bin/start-coaster-service
Log:
A few updates for better logging


Modified: trunk/bin/grid/run-worker.sh
===================================================================
--- trunk/bin/grid/run-worker.sh	2012-05-22 12:27:09 UTC (rev 5790)
+++ trunk/bin/grid/run-worker.sh	2012-05-22 15:25:28 UTC (rev 5791)
@@ -4,14 +4,13 @@
 workername=$2
 origlogdir=$3
 echo OSG_WN_TMP=$OSG_WN_TMP
-if [ _$OSG_WN_TMP = _ ]; then
-  OSG_WN_TMP=/tmp
-fi
 
+#if [ _$OSG_WN_TMP = _ ]; then
+#  OSG_WN_TMP=/tmp
+#fi
 mkdir -p $OSG_WN_TMP
+
 logdir=$(mktemp -d $OSG_WN_TMP/${workername}.workerdir.XXXXXX)
-nlines=1000
-
 export PATH=${OSG_APP}/engage/scec:${OSG_APP}/engage/scec/JBSim3d/bin:${OSG_APP}/engage/scec/SpectralAcceleration/p2utils:${OSG_APP}/extenci/swift/DSSAT/bin:${OSG_APP}/extenci/aashish/terfix/bin:$PATH
 #export PATH=${OSG_PATH}:$PATH
 
@@ -19,6 +18,8 @@
 echo "=== name:    $workername Running in dir $(pwd)"
 echo "=== cwd:     $(pwd)"
 echo "=== logdir:  $logdir"
+echo "=== disk space: "
+df -h
 echo "=== path:    $PATH"
 echo "==============================================="
 
@@ -31,9 +32,14 @@
 
 echo "=== exit: worker.pl exited with code=$exitcode"
 
-echo "=== worker log - last $nlines lines:"
+echo "=== worker logs:"
 
 echo
 
-tail -v -n $nlines $logdir/*
+for file in $logdir/*
+do
+   echo $file
+   echo -------
+   cat $file
+done
 

Modified: trunk/bin/start-coaster-service
===================================================================
--- trunk/bin/start-coaster-service	2012-05-22 12:27:09 UTC (rev 5790)
+++ trunk/bin/start-coaster-service	2012-05-22 15:25:28 UTC (rev 5791)
@@ -302,7 +302,7 @@
 
    echo Starting workers   
    mkdir -p condor
-   run-gwms-workers $EXECUTION_URL $CONDOR_WORKERS > gwms-workers.log 2>&1 &
+   run-gwms-workers $EXECUTION_URL $CONDOR_WORKERS 
 }
 
 # Start cobalt workers
@@ -513,7 +513,7 @@
 cat > $RUN_DIR/cf << EOF
 use.provider.staging=true
 wrapperlog.always.transfer=false
-execution.retries=0
+execution.retries=10
 provider.staging.pin.swiftfiles=false
 sitedir.keep=false
 EOF