[Swift-commit] r6002 - branches/release-0.94/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-10-30 14:43:40 -0500 (Tue, 30 Oct 2012)
New Revision: 6002

Modified:
   branches/release-0.94/bin/start-coaster-service
Log:
Change start-coaster-service for condor
   - avoid creating multiple submit files
   - transfer a copy of worker.pl to the submit host


Modified: branches/release-0.94/bin/start-coaster-service
===================================================================
--- branches/release-0.94/bin/start-coaster-service	2012-10-29 19:53:48 UTC (rev 6001)
+++ branches/release-0.94/bin/start-coaster-service	2012-10-30 19:43:40 UTC (rev 6002)
@@ -275,11 +275,10 @@
       export CONDOR_MACHINE_COUNT=1
    fi
 
-export MYPID=$$
-cat <<EOF > start_workers.$MYPID.submit
+cat <<EOF > start_workers.submit
 output = workers.stdout
 error = workers.stderr
-executable = $SWIFT_BIN/$WORKER
+executable = $WORKER_LOCATION/$WORKER
 arguments = $EXECUTION_URL node .
 notification = Never
 leave_in_queue = FALSE
@@ -289,10 +288,11 @@
 EOF
 
    if [ -n "$WORKER_RELAY_HOST" ]; then
-      scp start_workers.$MYPID.submit $WORKER_USERNAME@$WORKER_RELAY_HOST:
-      ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "condor_submit start_workers.$MYPID.submit"
+      scp start_workers.submit $WORKER_USERNAME@$WORKER_RELAY_HOST:
+      scp $SWIFT_BIN/$WORKER $WORKER_USERNAME@$WORKER_RELAY_HOST:$WORKER_LOCATION > /dev/null 2>&1
+      ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "condor_submit start_workers.submit"
    else
-      condor_submit start_workers.$MYPID.submit
+      condor_submit start_workers.submit
    fi
 }