sneak
/
ppss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fixes

This commit is contained in:
Louwrentius 2009-03-02 02:25:12 +00:00
parent d8b1845310
commit 0d30342fc8
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
branches/distributed-ppss/ppss.sh
View File

@ -250,7 +250,7 @@ add_var_to_config () {
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
case $1 in case $1 in
--config ) --config|-C )
CONFIG="$2" CONFIG="$2"
if [ "$MODE" == "config" ] if [ "$MODE" == "config" ]
@ -282,22 +282,22 @@ do
shift 2 shift 2
;; ;;
--nodes ) --node|-n )
NODES_FILE="$2" NODES_FILE="$2"
shift 2 shift 2
;; ;;
--sourcefile ) --sourcefile|-f )
INPUT_FILE="$2" INPUT_FILE="$2"
add_var_to_config INPUT_FILE "$INPUT_FILE" add_var_to_config INPUT_FILE "$INPUT_FILE"
shift 2 shift 2
;; ;;
--sourcedir ) --sourcedir|-d )
SRC_DIR="$2" SRC_DIR="$2"
add_var_to_config SRC_DIR "$SRC_DIR" add_var_to_config SRC_DIR "$SRC_DIR"
shift 2 shift 2
;; ;;
--command ) --command|-c )
COMMAND=$2 COMMAND=$2
if [ "$MODE" == "config" ] if [ "$MODE" == "config" ]
then then
@ -307,20 +307,20 @@ do
shift 2 shift 2
;; ;;
--help ) --help|-h )
showusage showusage
exit 1;; exit 1;;
--hyperthreading ) --enable-ht|-j )
HYPERTHREADING=yes HYPERTHREADING=yes
add_var_to_config HYPERTHREADING "yes" add_var_to_config HYPERTHREADING "yes"
shift 1 shift 1
;; ;;
--log ) --log|-l )
LOGFILE="$2" LOGFILE="$2"
add_var_to_config LOGFILE "$LOGFILE" add_var_to_config LOGFILE "$LOGFILE"
shift 2 shift 2
;; ;;
--key ) --key|-k )
SSH_KEY="$2" SSH_KEY="$2"
add_var_to_config SSH_KEY "$SSH_KEY" add_var_to_config SSH_KEY "$SSH_KEY"
if [ ! -z "$SSH_KEY" ] if [ ! -z "$SSH_KEY" ]
@ -329,17 +329,17 @@ do
fi fi
shift 2 shift 2
;; ;;
--no-secure-copy ) --no-secure-copy|-b )
SECURE_COPY=0 SECURE_COPY=0
add_var_to_config SECURE_COPY "$SECURE_COPY" add_var_to_config SECURE_COPY "$SECURE_COPY"
shift 1 shift 1
;; ;;
--outputdir ) --outputdir|-o )
REMOTE_OUTPUT_DIR="$2" REMOTE_OUTPUT_DIR="$2"
add_var_to_config REMOTE_OUTPUT_DIR "$REMOTE_OUTPUT_DIR" add_var_to_config REMOTE_OUTPUT_DIR "$REMOTE_OUTPUT_DIR"
shift 2 shift 2
;; ;;
--processes ) --processes|-p )
TMP="$2" TMP="$2"
if [ ! -z "$TMP" ] if [ ! -z "$TMP" ]
then then
@ -348,28 +348,28 @@ do
shift 2 shift 2
fi fi
;; ;;
--server ) --server|-s )
SSH_SERVER="$2" SSH_SERVER="$2"
add_var_to_config SSH_SERVER "$SSH_SERVER" add_var_to_config SSH_SERVER "$SSH_SERVER"
shift 2 shift 2
;; ;;
--script ) --script|-S )
SCRIPT="$2" SCRIPT="$2"
add_var_to_config SCRIPT "$SCRIPT" add_var_to_config SCRIPT "$SCRIPT"
shift 2 shift 2
;; ;;
--transfer ) --transfer|-t )
TRANSFER_TO_SLAVE="1" TRANSFER_TO_SLAVE="1"
add_var_to_config TRANSFER_TO_SLAVE "$TRANSFER_TO_SLAVE" add_var_to_config TRANSFER_TO_SLAVE "$TRANSFER_TO_SLAVE"
shift 1 shift 1
;; ;;
--user ) --user|-u )
USER="$2" USER="$2"
add_var_to_config USER "$USER" add_var_to_config USER "$USER"
shift 2 shift 2
;; ;;
--version ) --version|-v )
echo "" echo ""
echo "$SCRIPT_NAME version $SCRIPT_VERSION" echo "$SCRIPT_NAME version $SCRIPT_VERSION"
echo "" echo ""
@ -593,7 +593,7 @@ start_ppss_on_node () {
NODE="$1" NODE="$1"
log INFO "Starting PPSS on node $NODE." log INFO "Starting PPSS on node $NODE."
ssh $USER@$NODE "cd $PPSS_HOME_DIR ; screen -d -m -S PPSS ./ppss.sh node -config $CONFIG" ssh $USER@$NODE "cd $PPSS_HOME_DIR ; screen -d -m -S PPSS ./ppss.sh node --config $CONFIG"
} }
@ -774,7 +774,6 @@ upload_item () {
log DEBUG "Uploading item $ITEM." log DEBUG "Uploading item $ITEM."
if [ "$SECURE_COPY" == "1" ] if [ "$SECURE_COPY" == "1" ]
then then
#scp -q $SSH_OPTS $SSH_KEY $PPSS_LOCAL_OUTPUT/"$ITEM"/* $USER@$SSH_SERVER:$REMOTE_OUTPUT_DIR
scp -q $SSH_OPTS $SSH_KEY $ITEM $USER@$SSH_SERVER:$REMOTE_OUTPUT_DIR scp -q $SSH_OPTS $SSH_KEY $ITEM $USER@$SSH_SERVER:$REMOTE_OUTPUT_DIR
ERROR="$?" ERROR="$?"
if [ ! "$ERROR" == "0" ] if [ ! "$ERROR" == "0" ]
@ -965,7 +964,7 @@ commando () {
LOG_FILE_NAME=`echo "$ITEM" | sed s/^\\\.//g | sed s/^\\\.\\\.//g | sed s/\\\///g` LOG_FILE_NAME=`echo "$ITEM" | sed s/^\\\.//g | sed s/^\\\.\\\.//g | sed s/\\\///g`
ITEM_LOG_FILE="$JOB_LOG_DIR/$LOG_FILE_NAME" ITEM_LOG_FILE="$JOB_LOG_DIR/$LOG_FILE_NAME"
mkdir $PPSS_LOCAL_OUTPUT/"$ITEM_NO_PATH" mkdir -p $PPSS_LOCAL_OUTPUT/"$ITEM_NO_PATH"
does_file_exist "$ITEM_LOG_FILE" does_file_exist "$ITEM_LOG_FILE"
if [ "$?" == "0" ] if [ "$?" == "0" ]
@ -1013,7 +1012,7 @@ commando () {
fi fi
if [ ! -z "$REMOTE_OUTPUT_DIR" ] if [ ! -z "$REMOTE_OUTPUT_DIR" ] && [ ! -z "$SSH_SERVER" ]
then then
upload_item "$PPSS_LOCAL_OUTPUT/$ITEM_NO_PATH/*" upload_item "$PPSS_LOCAL_OUTPUT/$ITEM_NO_PATH/*"
fi fi
@ -1021,7 +1020,7 @@ commando () {
if [ ! -z "$SSH_SERVER" ] if [ ! -z "$SSH_SERVER" ]
then then
log DEBUG "Uploading item log file $ITEM_LOG_FILE to master." log DEBUG "Uploading item log file $ITEM_LOG_FILE to master."
scp -q $SSH_OPTS $SSH_KEY $ITEM_LOG_FILE $USER@$SSH_SERVER:~/$JOB_LOG_DIR scp -q $SSH_OPTS $SSH_KEY $ITEM_LOG_FILE $USER@$SSH_SERVER:~/$JOB_LOG_DIR/
fi fi
fi fi