Fixed isssue when using NFS for file transport.

This commit is contained in:
Louwrentius 2010-03-07 22:29:21 +00:00
parent ea33b0f0e7
commit 283c93f871
2 changed files with 22 additions and 7 deletions

23
ppss
View File

@ -25,7 +25,7 @@ trap 'kill_process' SIGINT
# Setting some vars. # Setting some vars.
SCRIPT_NAME="Distributed Parallel Processing Shell Script" SCRIPT_NAME="Distributed Parallel Processing Shell Script"
SCRIPT_VERSION="2.57b1" SCRIPT_VERSION="2.60b1"
# The first argument to this script can be a mode. # The first argument to this script can be a mode.
MODES="node start config stop pause continue deploy status erase kill ec2" MODES="node start config stop pause continue deploy status erase kill ec2"
@ -830,7 +830,7 @@ erase_ppss () {
then then
for NODE in `cat $NODES_FILE` for NODE in `cat $NODES_FILE`
do do
log INFO "Erasing PPSS homedir $PPSS_DIR from node $NODE." log DSPLY "Erasing PPSS homedir $PPSS_DIR from node $NODE."
ssh -q $SSH_KEY $SSH_OPTS $USER@$NODE "rm -rf $PPSS_HOME_DIR" ssh -q $SSH_KEY $SSH_OPTS $USER@$NODE "rm -rf $PPSS_HOME_DIR"
done done
else else
@ -1609,12 +1609,18 @@ commando () {
# #
if [ "$DOWNLOAD_TO_NODE" == "0" ] if [ "$DOWNLOAD_TO_NODE" == "0" ]
then then
if [ -z "$SRC_DIR" ] && [ ! -z "$INPUT_FILE" ] if [ "$VIRTUAL" == "1" ]
then then
log DEBUG "Item is virtual, thus not downloading."
else
log DEBUG "Using item straight from the server, no copy." log DEBUG "Using item straight from the server, no copy."
if [ "$RECURSION" == "0" ]
then
ITEM="$SRC_DIR/$ITEM"
else else
ITEM="$ITEM" ITEM="$ITEM"
fi fi
fi
else else
if [ "$RECURSION" == "1" ] if [ "$RECURSION" == "1" ]
then then
@ -1728,9 +1734,18 @@ commando () {
then then
DIR_NAME="" DIR_NAME=""
fi fi
upload_item "$OUTPUT_DIR" "$DIR_NAME"
fi fi
#
# Upload the output file back to the server.
#
upload_item "$OUTPUT_DIR" "$DIR_NAME"
#
# Upload the log file to the server.
#
elapsed "$BEFORE" "$AFTER" >> "$ITEM_LOG_FILE" elapsed "$BEFORE" "$AFTER" >> "$ITEM_LOG_FILE"
echo -e "" >> "$ITEM_LOG_FILE" echo -e "" >> "$ITEM_LOG_FILE"

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
DEBUG="$1" DEBUG="$1"
VERSION="2.57b1" VERSION="2.60b1"
TMP_DIR="ppss" TMP_DIR="ppss"
PPSS=./ppss PPSS=./ppss
PPSS_DIR=ppss_dir PPSS_DIR=ppss_dir