[Swift-commit] r5747 - trunk/bin/grid

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-04-17 08:01:00 -0500 (Tue, 17 Apr 2012)
New Revision: 5747

Modified:
   trunk/bin/grid/run-gwms-workers
   trunk/bin/grid/start-grid-service
Log:
Set proxy information on condor submit script for globus-url-copy and for usage tracking
Fix for log files - previously logs were getting clobbered. Now each condor job has it's own log for easier debugging
Walltime fixes
Avoid using /tmp for swift work directory


Modified: trunk/bin/grid/run-gwms-workers
===================================================================
--- trunk/bin/grid/run-gwms-workers	2012-04-10 20:40:05 UTC (rev 5746)
+++ trunk/bin/grid/run-gwms-workers	2012-04-17 13:01:00 UTC (rev 5747)
@@ -9,6 +9,7 @@
 workerWrapper=`which run-worker.sh`
 workerContact=$1
 x509userproxy=$( voms-proxy-info 2>&1 | grep path | awk '{print $NF}' )
+wallTimeMinutes=60
 n=$2
 
 [ "$#" -eq 2 ] || die "2 arguments required, $# provided"
@@ -33,11 +34,12 @@
 arguments = $workerContact scec /tmp
 environment = WORKER_LOGGING_LEVEL=DEBUG
 Input   = $workerExecutable
-Error   = condor/job.err
-Output  = condor/job.out
+Error   = condor/job.\$(Cluster).\$(Process).err
+Output  = condor/job.\$(Cluster).\$(Process).out
 log     = condor.log
 
 x509userproxy = $x509userproxy
+requirements = (((GLIDEIN_ToRetire + GLIDEIN_Job_Max_Time) - CurrentTime) > $wallTimeMinutes*60) 
 queue $n
 EOF
 

Modified: trunk/bin/grid/start-grid-service
===================================================================
--- trunk/bin/grid/start-grid-service	2012-04-10 20:40:05 UTC (rev 5746)
+++ trunk/bin/grid/start-grid-service	2012-04-17 13:01:00 UTC (rev 5747)
@@ -44,8 +44,7 @@
 
 echo THROTTLE=$THROTTLE LOGLEVEL=$LOGLEVEL
 
-numsites=`cat greensites | wc -l`
-
+#numsites=`cat greensites | wc -l`
 #coaster-service -port 1984 -localport 35753 -nosec >& local-coaster-service.out &
 sleep 5
 start-swift-service 1 &
@@ -63,7 +62,7 @@
       <!-- <filesystem provider="local" url="none" /> -->
       <profile namespace="swift" key="stagingMethod">proxy</profile>
       <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
-      <workdirectory>/tmp/$USER</workdirectory>
+      <workdirectory>.</workdirectory>
     </pool>
     
    <pool handle="localhost">