broken en messed up - just a backup

branches/distributed-ppss/ppss.sh

@@ -136,7 +136,6 @@ kill_process () {
             then
                 kill -9 "$SSH_MASTER_PID"
             fi
-            log INFO "Finished."
             echo ""
             exit 0
         fi
@@ -190,7 +189,7 @@ check_for_interrupt () {
 
 cleanup () {
 
-    log DEBUG "$FUNCNAME - Cleaning up all temp files and processes."
+    #log DEBUG "$FUNCNAME - Cleaning up all temp files and processes."
     
     if [ -e "$FIFO" ]
     then 
@@ -231,26 +230,55 @@ is_running () {
     fi
 }
 
-# If no arguments are specified, show usage.
-#if [ $# -eq 0 ]
-#then
-#  showusage
-#  exit 1
-#fi
 
-if [ -e $CONFIG ]
+add_var_to_config () {
-then
-    echo HOER HOER HOER HOER HOER HOER HOER HOER HOER
-    source $CONFIG
-    echo $COMMAND
-    echo $SSH_SERVER
-    echo $USER
-else
     
-    # Process any command-line options that are specified."
+    if [ "$MODE" == "config" ]
-    while [ $# -gt 0 ]
+    then
-    do
+
+        VAR="$1"
+        VALUE="$2"
+
+        echo -e "$VAR=$VALUE" >> $CONFIG
+    fi
+}
+
+# Process any command-line options that are specified."
+while [ $# -gt 0 ]
+do
     case $1 in
+        -config )
+            CONFIG=$2
+
+            if [ "$MODE" == "config" ]
+            then
+                if [ -e "$CONFIG" ]
+                then
+                    echo "Do want to overwrite existing config file?"
+                    read yn
+                    if [ "$yn" == "y" ]
+                    then
+                        rm "$CONFIG"
+                    else
+                        echo "Aborting..."
+                        cleanup
+                        exit
+                    fi 
+                fi
+            fi
+
+            if [ ! "$MODE" == "config" ]
+            then
+                source $CONFIG
+            fi
+
+            if [ ! -z "$SSH_KEY" ]
+            then
+                SSH_KEY="-i $SSH_KEY"
+            fi
+
+            shift 2
+            ;;
         -n ) 
             NODES_FILE="$2"
             shift 2
@@ -258,22 +286,23 @@ else
 
         -f )
             INPUT_FILE="$2"
-                echo -e INPUT_FILE=\"$INPUT_FILE\" >> $CONFIG
+            add_var_to_config INPUT_FILE "$INPUT_FILE"
             shift 2
             ;;
         -d ) 
             SRC_DIR="$2"
-                echo -e SRC_DIR=\"$SRC_DIR\" >> $CONFIG
+            add_var_to_config SRC_DIR "$SRC_DIR"
             shift 2
             ;; 
         -D )
             DAEMON=1
-                echo -e DAEMON=1 >> $CONFIG
+            add_var_to_config DAEMON "$DAEMON"
             shift 2
             ;;
         -c ) 
-                COMMAND="$2"
+            COMMAND=$2
-                echo -e COMMAND=\'$COMMAND\' >> $CONFIG
+            COMMAND=\'$COMMAND\'
+            add_var_to_config COMMAND "$COMMAND"
             shift 2
             ;;
 
@@ -282,27 +311,31 @@ else
             exit 1;;
         -j )
             HYPERTHREADING=yes
-                echo -e HYPERTHREADING=yes >> $CONFIG 
+            add_var_to_config HYPERTHREADING "yes"
             shift 1
             ;;
         -l )
             LOGFILE="$2"
-                echo -e LOGFILE=\"$LOGFILE\" >> $CONFIG
+            add_var_to_config LOGFILE "$LOGFILE"
             shift 2
             ;;
         -k )
-                SSH_KEY="-i $2"
+            SSH_KEY="$2"
-                echo -e SSH_KEY=\"$SSH_KEY\"
+            add_var_to_config SSH_KEY "$SSH_KEY"
+            if [ ! -z "$SSH_KEY" ]
+            then
+                SSH_KEY="-i $SSH_KEY"
+            fi
             shift 2
             ;;
         -b )
             SECURE_COPY=0
-                echo -e SECURE_COPY=0 >> $CONFIG
+            add_var_to_config SECURE_COPY "$SECURE_COPY"
             shift 1
             ;;
         -o )
             REMOTE_OUTPUT_DIR="$2"
-                echo -e REMOTE_OUTPUT_DIR=\"$REMOTE_OUTPUT_DIR\" >> $CONFIG
+            add_var_to_config REMOTE_OUTPUT_DIR "$REMOTE_OUTPUT_DIR"
             shift 2
             ;;
         -p )
@@ -310,22 +343,22 @@ else
             if [ ! -z "$TMP" ]
             then
                 MAX_NO_OF_RUNNING_JOBS="$TMP"
-                    echo -e MAX_NO_OF_RUNNING_JOBS=\"$MAX_NO_OF_RUNNING_JOBS\" >> $CONFIG
+                add_var_to_config MAX_NO_OF_RUNNING_JOBS "$MAX_NO_OF_RUNNING_JOBS" 
                 shift 2
             fi
             ;;
         -s ) 
             SSH_SERVER="$2"
-                echo -e SSH_SERVER=\"$SSH_SERVER\" >> $CONFIG
+            add_var_to_config SSH_SERVER "$SSH_SERVER"
             shift 2
             ;;
         -t )
             TRANSFER_TO_SLAVE="1"    
-                echo -e TRANSFER_TO_SLAVE=\"$TRANSFER_TO_SLAVE\" >> $CONFIG
+            add_var_to_config TRANSFER_TO_SLAVE "$TRANSFER_TO_SLAVE"
             ;;
         -u )
             USER="$2"
-                echo -e USER=\"$USER\" >> $CONFIG
+            add_var_to_config USER "$USER"
             shift 2
             ;;
 
@@ -339,12 +372,7 @@ else
             showusage
             exit 1;;
     esac
-    done
+done
-fi
-
-    echo $COMMAND
-    echo $SSH_SERVER
-    echo $USER
 
 # Init all vars
 init_vars () {
@@ -502,6 +530,8 @@ deploy_ppss () {
             set_error $?
             scp -q $KEY $USER@$NODE:~/$PPSS_HOME_DIR
             set_error $?
+            scp -q $CONFIG $USER@$NODE:~/$PPSS_HOME_DIR
+            set_error $?
             if [ "$ERROR" == "0" ]
             then
                 log INFO "PPSS installed on node $NODE."
@@ -514,32 +544,12 @@ deploy_ppss () {
 
 start_ppss_on_node () {
 
-    # USER
+    NODE="$1"
-    # NODE
-    # PATH OF PPSS
-    # execute with command line args.
 
-    if [ ! -e "$NODES_FILE" ]
-    then
-        log INFO "ERROR file $NODES with list of nodes does not exist."
-        exit 1
-    else
-        for NODE in `cat $NODES_FILE`
-        do
-            echo "----> ARGS IS $ARGS"
     #ssh $USER@$NODE cd $PPSS_HOME_DIR ; screen -S PPSS ./$0 node 
-            CMD=""
-
-            for (( i = 1; i <= $# ; i++ )); do
-              eval ARG=\$$i
-              CMD="$CMD $(echo "$ARG" | awk '{gsub(".", "\\\\&");print}')"
-            done
-
     
     #ssh $USER@$NODE "cd $PPSS_HOME_DIR ; pwd ; screen -d -m -S PPSS ./ppss.sh node "$CMD" ; exit"
-            ssh $USER@$NODE "cd $PPSS_HOME_DIR ; pwd ; ./ppss.sh node $CMD" 
+    ssh $USER@$NODE "cd $PPSS_HOME_DIR ; hostname ; screen -d -m -S PPSS ./ppss.sh node -config $CONFIG" 
-        done
-    fi
 }
 
 
@@ -988,10 +998,29 @@ main () {
                 LISTENER_PID=$!
                 start_all_workers
                 ;;
-       start )
+        server )
+                # This option only starts all nodes.
                 init_vars
-                start_ppss_on_node 
+                
+                if [ ! -e "$NODES_FILE" ]
+                then
+                    log INFO "ERROR file $NODES with list of nodes does not exist."
+                    cleanup
+                    exit 1
+                else
+                    for NODE in `cat $NODES_FILE`
+                    do
+                        start_ppss_on_node "$NODE"
+                    done
+                fi
                 ;;
+        config )
+
+                log INFO "Generating configuration file $CONFIG"
+                cleanup
+                exit
+                ;;
+
         stop )
                 #some stop
                 ;;