fixing download function
This commit is contained in:
parent
3e5fbfd38f
commit
aaae2dc713
31
ppss.sh
31
ppss.sh
|
@ -630,7 +630,7 @@ erase_ppss () {
|
||||||
for NODE in `cat $NODES_FILE`
|
for NODE in `cat $NODES_FILE`
|
||||||
do
|
do
|
||||||
log INFO "Erasing PPSS homedir $PPSS_HOME_DIR from node $NODE."
|
log INFO "Erasing PPSS homedir $PPSS_HOME_DIR from node $NODE."
|
||||||
ssh $SSH_OPTS $USER@$NODE "rm -rf $PPSS_HOME_DIR"
|
ssh $SSH_OPTS $SSH_KEY $USER@$NODE "rm -rf $PPSS_HOME_DIR"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -648,20 +648,23 @@ deploy () {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
ssh -q $SSH_OPTS $USER@$NODE "mkdir $PPSS_HOME_DIR >> /dev/null 2>&1"
|
KEY=`echo $SSH_KEY | cut -d " " -f 2`
|
||||||
scp -q $SSH_OPTS $0 $USER@$NODE:~/$PPSS_HOME_DIR
|
|
||||||
|
ssh -q $SSH_OPTS $SSH_KEY $USER@$NODE "mkdir $PPSS_HOME_DIR >> /dev/null 2>&1"
|
||||||
|
scp -q $SSH_OPTS $SSH_KEY $0 $USER@$NODE:~/$PPSS_HOME_DIR
|
||||||
set_error $?
|
set_error $?
|
||||||
scp -q $SSH_OPTS $KEY $USER@$NODE:~/$PPSS_HOME_DIR
|
scp -q $SSH_OPTS $SSH_KEY $KEY $USER@$NODE:~/$PPSS_HOME_DIR
|
||||||
set_error $?
|
set_error $?
|
||||||
scp -q $SSH_OPTS $CONFIG $USER@$NODE:~/$PPSS_HOME_DIR
|
scp -q $SSH_OPTS $SSH_KEY $CONFIG $USER@$NODE:~/$PPSS_HOME_DIR
|
||||||
set_error $?
|
set_error $?
|
||||||
scp -q $SSH_OPTS known_hosts $USER@$NODE:~/$PPSS_HOME_DIR
|
scp -q $SSH_OPTS $SSH_KEY known_hosts $USER@$NODE:~/$PPSS_HOME_DIR
|
||||||
set_error $?
|
set_error $?
|
||||||
scp -q $SSH_OPTS $SCRIPT $USER@$NODE:~/$PPSS_HOME_DIR
|
scp -q $SSH_OPTS $SSH_KEY $SCRIPT $USER@$NODE:~/$PPSS_HOME_DIR
|
||||||
set_error $?
|
set_error $?
|
||||||
|
|
||||||
if [ ! -z "$INPUT_FILE" ]
|
if [ ! -z "$INPUT_FILE" ]
|
||||||
then
|
then
|
||||||
scp -q $SSH_OPTS $INPUT_FILE $USER@$NODE:~/$PPSS_HOME_DIR
|
scp -q $SSH_OPTS $SSH_KEY $INPUT_FILE $USER@$NODE:~/$PPSS_HOME_DIR
|
||||||
set_error $?
|
set_error $?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -716,7 +719,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 $SSH_OPTS $SSH_KEY $USER@$NODE "cd $PPSS_HOME_DIR ; screen -d -m -S PPSS ./ppss.sh node --config $CONFIG"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -897,14 +900,16 @@ download_item () {
|
||||||
if [ "$TRANSFER_TO_SLAVE" == "1" ]
|
if [ "$TRANSFER_TO_SLAVE" == "1" ]
|
||||||
then
|
then
|
||||||
log DEBUG "Transfering item $ITEM to local disk."
|
log DEBUG "Transfering item $ITEM to local disk."
|
||||||
if [ "$SECURE_COPY" == "1" ]
|
if [ "$SECURE_COPY" == "1" ] && [ ! -z "$SSH_SERVER" ]
|
||||||
then
|
then
|
||||||
scp -q $SSH_OPTS $SSH_KEY $USER@$SSH_SERVER:"$ITEM_WITH_PATH" $PPSS_LOCAL_TMPDIR
|
scp -q $SSH_OPTS $SSH_KEY $USER@$SSH_SERVER:"$ITEM_WITH_PATH" $PPSS_LOCAL_TMPDIR
|
||||||
log DEBUG "Exit code of transfer is $?"
|
log DEBUG "Exit code of remote transfer is $?"
|
||||||
else
|
else
|
||||||
cp "$ITEM_WITH_PATH" $PPSS_LOCAL_TMPDIR
|
cp "$ITEM_WITH_PATH" $PPSS_LOCAL_TMPDIR
|
||||||
log DEBUG "Exit code of transfer is $?"
|
log DEBUG "Exit code of local transfer is $?"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
log DEBUG "No transfer of item $ITEM to workpath."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1246,7 +1251,7 @@ show_status () {
|
||||||
ITEMS=`exec_cmd "cat $INPUT_FILE | wc -l"`
|
ITEMS=`exec_cmd "cat $INPUT_FILE | wc -l"`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PROCESSED=`exec_cmd "ls -1 $ITEM_LOCK_DIR | wc -l"`
|
PROCESSED=`exec_cmd "ls -1 $ITEM_LOCK_DIR | wc -l"` 2>&1 >> /dev/null
|
||||||
STATUS=$((100 * $PROCESSED / $ITEMS))
|
STATUS=$((100 * $PROCESSED / $ITEMS))
|
||||||
|
|
||||||
log INFO "$STATUS percent complete."
|
log INFO "$STATUS percent complete."
|
||||||
|
|
Loading…
Reference in New Issue