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

27
ppss
View File

@ -25,7 +25,7 @@ trap 'kill_process' SIGINT
# Setting some vars.
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.
MODES="node start config stop pause continue deploy status erase kill ec2"
@ -830,7 +830,7 @@ erase_ppss () {
then
for NODE in `cat $NODES_FILE`
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"
done
else
@ -1609,11 +1609,17 @@ commando () {
#
if [ "$DOWNLOAD_TO_NODE" == "0" ]
then
if [ -z "$SRC_DIR" ] && [ ! -z "$INPUT_FILE" ]
if [ "$VIRTUAL" == "1" ]
then
log DEBUG "Using item straight from the server, no copy."
log DEBUG "Item is virtual, thus not downloading."
else
ITEM="$ITEM"
log DEBUG "Using item straight from the server, no copy."
if [ "$RECURSION" == "0" ]
then
ITEM="$SRC_DIR/$ITEM"
else
ITEM="$ITEM"
fi
fi
else
if [ "$RECURSION" == "1" ]
@ -1728,9 +1734,18 @@ commando () {
then
DIR_NAME=""
fi
upload_item "$OUTPUT_DIR" "$DIR_NAME"
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"
echo -e "" >> "$ITEM_LOG_FILE"

View File

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