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

Major rework on distributed mode

Browse Source
This commit is contained in:
louwrentius 2011-12-25 02:11:46 +00:00
parent 30f92bbae9
commit ec1d542ab6
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ppss
View File

@ -354,12 +354,10 @@ exec_cmd () {
then then
if [ -z "$NOMP" ] if [ -z "$NOMP" ]
then then
#log DEBUG "REMOTE EXEC"
ssh $SSH_OPTS $SSH_KEY $USER@$SSH_SERVER $CMD ssh $SSH_OPTS $SSH_KEY $USER@$SSH_SERVER $CMD
STATUS=$? STATUS=$?
elif [ "$NOMP" == "1" ] elif [ "$NOMP" == "1" ]
then then
#log DEBUG "REMOTE EXEC NO MP"
ssh $SSH_OPTS_NOMP $SSH_KEY $USER@$SSH_SERVER $CMD ssh $SSH_OPTS_NOMP $SSH_KEY $USER@$SSH_SERVER $CMD
STATUS=$? STATUS=$?
fi fi
@ -380,10 +378,8 @@ does_file_exist () {
RES=`exec_cmd "ls -1 $FILE" 2>&1` RES=`exec_cmd "ls -1 $FILE" 2>&1`
if [ "$?" = "0" ] if [ "$?" = "0" ]
then then
#log DEBUG "$FILE does exist"
return 0 return 0
else else
#log DEBUG "$FILE does not exist"
return 1 return 1
fi fi
} }
@ -1668,8 +1664,6 @@ upload_item () {
if [ "$RECURSION" = "1" ] if [ "$RECURSION" = "1" ]
then then
log DEBUG "Recursive copy is enabled." log DEBUG "Recursive copy is enabled."
log DEBUG "REMOTE_OUTPUT_DIR = $REMOTE_OUTPUT_DIR"
log DEBUG "REMOTE DEST DIR = $REMOTE_DEST_DIR"
TMP_DESTINATION="$REMOTE_OUTPUT_DIR/$REMOTE_DEST_DIR" TMP_DESTINATION="$REMOTE_OUTPUT_DIR/$REMOTE_DEST_DIR"
else else
log DEBUG "Recursive copy is disabled." log DEBUG "Recursive copy is disabled."
@ -1687,8 +1681,7 @@ upload_item () {
then then
log DEBUG "Secure copy is enabled." log DEBUG "Secure copy is enabled."
log DEBUG "Copy contents of $LOCAL_SRC_DIR to server at $DESTINATION" log DEBUG "Copy contents of $LOCAL_SRC_DIR to server at $DESTINATION"
log DEBUG "scp $SSH_OPTS $SSH_KEY $LOCAL_SRC_DIR/* $USER@$SSH_SERVER:$DESTINATION" scp $SSH_OPTS $SSH_KEY $LOCAL_SRC_DIR/* $USER@$SSH_SERVER:"$DESTINATION"
scp $SSH_OPTS $SSH_KEY $LOCAL_SRC_DIR/* $USER@$SSH_SERVER:"$DESTINATION" >> scplog.txt 2>&1
ERROR="$?" ERROR="$?"
if [ ! "$ERROR" == "0" ] if [ ! "$ERROR" == "0" ]
then then
@ -1698,10 +1691,8 @@ upload_item () {
rm -rf ./"$LOCAL_SRC_DIR" rm -rf ./"$LOCAL_SRC_DIR"
fi fi
else else
log DEBUG "Secure copy is disabled." log DEBUG "Secure copy is disabled - using regular cp."
log DEBUG `pwd` cp "$LOCAL_SRC_DIR"/* "$TMP_DESTINATION"
cp "$LOCAL_SRC_DIR"/* "$TMP_DESTINATION" >> scplog.txt 2>&1
log DEBUG "cp $LOCAL_SRC_DIR/* $DESTINATION >> scplog.txt 2>&1"
if [ ! "$?" == "0" ] if [ ! "$?" == "0" ]
then then
log DEBUG "ERROR - uploading of $LOCAL_SRC_DIR via CP to $DESTINATION failed." log DEBUG "ERROR - uploading of $LOCAL_SRC_DIR via CP to $DESTINATION failed."
@ -2328,7 +2319,6 @@ commando () {
if [ ! -z "$SSH_SERVER" ] if [ ! -z "$SSH_SERVER" ]
then then
log DEBUG "Uploading item log file $ITEM_LOG_FILE to master $PPSS_HOME_DIR/$JOB_LOG_DIR"
scp -q $SSH_OPTS $SSH_KEY "$ITEM_LOG_FILE" $USER@$SSH_SERVER:$PPSS_HOME_DIR/$JOB_LOG_DIR scp -q $SSH_OPTS $SSH_KEY "$ITEM_LOG_FILE" $USER@$SSH_SERVER:$PPSS_HOME_DIR/$JOB_LOG_DIR
if [ ! "$?" ] if [ ! "$?" ]
then then