[Swift-commit] r5793 - in trunk: bin src/org/griphyn/vdl/mapping/file

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2012-05-23 08:37:55 -0500 (Wed, 23 May 2012)
New Revision: 5793

Modified:
   trunk/bin/gensites
   trunk/bin/start-coaster-service
   trunk/bin/stop-coaster-service
   trunk/src/org/griphyn/vdl/mapping/file/AbstractFileMapper.java
Log:
AbstractFileMapper currently prints a message that says "(input): N number of files". This can get very spammy on some workflows, to the point where it's nearly impossible to read the ticker bar. Disabled this message for now
start-coaster-service: Ability to remotely start workers for gwms and condor sites
gensites: When generating tc, currently assumes that the application is on the local filesystem. Add a test for this to avoid errors


Modified: trunk/bin/gensites
===================================================================
--- trunk/bin/gensites	2012-05-22 15:30:18 UTC (rev 5792)
+++ trunk/bin/gensites	2012-05-23 13:37:55 UTC (rev 5793)
@@ -199,8 +199,13 @@
                   NAME=`echo $line |cut -d'=' -f1|awk '{print $2}'`
                   COMMAND=`echo $line |cut -d'=' -f2`
                   COMMAND=`eval echo $COMMAND`
-                  COMMAND_PATH=$(cd $(dirname $COMMAND); pwd)/$(basename $COMMAND)
-                  echo $HOST $NAME $COMMAND_PATH null null null >> tc.data
+                  COMMAND_DIRNAME=$(dirname $COMMAND)
+                  if [ -d "$COMMAND_DIRNAME" ]; then
+                     COMMAND_PATH=$(cd $COMMAND_DIRNAME; pwd)/$(basename $COMMAND)
+                     echo $HOST $NAME $COMMAND_PATH null null null >> tc.data
+                  else
+                     echo $HOST $NAME $COMMAND null null null >> tc.data
+                  fi
               done
            fi
 

Modified: trunk/bin/start-coaster-service
===================================================================
--- trunk/bin/start-coaster-service	2012-05-22 15:30:18 UTC (rev 5792)
+++ trunk/bin/start-coaster-service	2012-05-23 13:37:55 UTC (rev 5793)
@@ -274,7 +274,7 @@
 cat <<EOF > start_workers.submit
 output = workers.stdout
 error = workers.stderr
-initialdir = $PWD 
+#initialdir = \$PWD 
 executable = $SWIFT_BIN/$WORKER
 arguments = $EXECUTION_URL node .
 notification = Never
@@ -282,8 +282,12 @@
 queue $CONDOR_WORKERS
 EOF
 
-   condor_submit start_workers.submit
-   return 0
+   if [ -n "$WORKER_RELAY_HOST" ]; then
+      scp start_workers.submit $WORKER_USERNAME@$WORKER_RELAY_HOST:
+      ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "condor_submit start_workers.submit"
+   else
+      condor_submit start_workers.submit
+   fi
 }
 
 # Start GWMS workers
@@ -301,8 +305,13 @@
    fi
 
    echo Starting workers   
-   mkdir -p condor
-   run-gwms-workers $EXECUTION_URL $CONDOR_WORKERS 
+   if [ -n "$WORKER_RELAY_HOST" ]; then
+      ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "mkdir -p condor"
+      ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "run-gwms-workers $EXECUTION_URL $CONDOR_WORKERS" 
+   else
+      mkdir -p condor
+      run-gwms-workers $EXECUTION_URL $CONDOR_WORKERS
+   fi
 }
 
 # Start cobalt workers

Modified: trunk/bin/stop-coaster-service
===================================================================
--- trunk/bin/stop-coaster-service	2012-05-22 15:30:18 UTC (rev 5792)
+++ trunk/bin/stop-coaster-service	2012-05-23 13:37:55 UTC (rev 5793)
@@ -61,7 +61,11 @@
 fi
 
 if [ "$WORKER_MODE" == "condor" ] || [ "$WORKER_MODE" == "gwms" ]; then
-   condor_rm $USER
+   if [ -n "$WORKER_RELAY_HOST" ]; then
+      ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "condor_rm $USER"    
+   else
+     condor_rm $USER
+   fi
 fi
 
 if [ -f "$HOME/.swift/machines" ]; then

Modified: trunk/src/org/griphyn/vdl/mapping/file/AbstractFileMapper.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/file/AbstractFileMapper.java	2012-05-22 15:30:18 UTC (rev 5792)
+++ trunk/src/org/griphyn/vdl/mapping/file/AbstractFileMapper.java	2012-05-23 13:37:55 UTC (rev 5793)
@@ -257,7 +257,7 @@
 		if(logger.isDebugEnabled()) {
 			logger.debug("Finish list existing paths for mapper "+this.hashCode()+" list="+result);
 		}
-		System.out.println(getVarName() + " (input): found " + result.size() + " files");
+		// System.out.println(getVarName() + " (input): found " + result.size() + " files");
 		return result;
 	}