[Swift-commit] r3987 - usertools/persistent-coasters

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2011-01-17 16:11:02 -0600 (Mon, 17 Jan 2011)
New Revision: 3987

Modified:
   usertools/persistent-coasters/settings.sh
   usertools/persistent-coasters/start-service.zsh
   usertools/persistent-coasters/system-info.sh
   usertools/persistent-coasters/workers-ssh.zsh
Log:
Improvements to ssh mode


Modified: usertools/persistent-coasters/settings.sh
===================================================================
--- usertools/persistent-coasters/settings.sh	2011-01-17 21:49:43 UTC (rev 3986)
+++ usertools/persistent-coasters/settings.sh	2011-01-17 22:11:02 UTC (rev 3987)
@@ -1,11 +1,11 @@
 
 # Keep all interesting settings in one place
 
-# sites file workDirectory location
-WORK=${HOME}/work
+# Where to place/launch worker.pl on the remote machine
+export WORKER_WORK=/home/${USER}/work
 
 # How to launch workers- local or ssh
-export WORKER_MODE=local
+export WORKER_MODE=ssh
 
 # Worker logging setting passed to worker.pl
 export WORKER_LOGGING=INFO
@@ -18,3 +18,4 @@
 NODES=64
 QUEUE=prod-devel
 MAXTIME=$(( 20 ))
+WORK=${HOME}/work

Modified: usertools/persistent-coasters/start-service.zsh
===================================================================
--- usertools/persistent-coasters/start-service.zsh	2011-01-17 21:49:43 UTC (rev 3986)
+++ usertools/persistent-coasters/start-service.zsh	2011-01-17 22:11:02 UTC (rev 3987)
@@ -6,8 +6,6 @@
 # Process management is incomplete here, check for
 # processes with ps
 
-set -x
-
 PC=$( cd $( dirname $0 ) ; /bin/pwd )
 TOOLS=${PC} # In the future this might be ${SWIFT_HOME}/tools
 source ${TOOLS}/helpers.zsh
@@ -26,14 +24,17 @@
 
 SWIFT_OUT=${LOGDIR}/swift.out
 
-local OUT=$1
-
 if [[ ${WORKER_MODE} == "local" ]] 
   then 
   source workers-local.zsh
 elif [[ ${WORKER_MODE} == "ssh" ]] 
+  then
   source workers-ssh.zsh
+else 
+  print "Unknown WORKER_MODE: ${WORKER_MODE}"
+  false
 fi
+exitcode "Could not find start-workers()!"
 
 # Obtain the URL to which Swift should connect
 get_service_coasters()

Modified: usertools/persistent-coasters/system-info.sh
===================================================================
--- usertools/persistent-coasters/system-info.sh	2011-01-17 21:49:43 UTC (rev 3986)
+++ usertools/persistent-coasters/system-info.sh	2011-01-17 22:11:02 UTC (rev 3987)
@@ -4,6 +4,7 @@
 # Simply report some system info to stdout for diagnostics
 
 hostname
+hostname -d
 echo
 uname -a
 

Modified: usertools/persistent-coasters/workers-ssh.zsh
===================================================================
--- usertools/persistent-coasters/workers-ssh.zsh	2011-01-17 21:49:43 UTC (rev 3986)
+++ usertools/persistent-coasters/workers-ssh.zsh	2011-01-17 22:11:02 UTC (rev 3987)
@@ -13,7 +13,8 @@
   for MACHINE in ${=WORKER_HOSTS}
   do
     pwd
-    ssh ${MACHINE} ${WORKER} ${URI} ${MACHINE} ${LOGDIR} &
+    scp ${WORKER} ${MACHINE}:${WORKER_WORK}
+    ssh ${MACHINE} ${WORKER_WORK}/worker.pl ${URI} ${MACHINE} ${LOGDIR} &
   done
 
   # TODO: manage these PIDs