More fixes for distributed operation.

This commit is contained in:
Louwrentius 2009-11-08 17:50:12 +00:00
parent 1b16eb62ee
commit e4bdd59475

View File

@ -1411,9 +1411,9 @@ commando () {
# Some error logging. Success or fail. # Some error logging. Success or fail.
if [ ! "$ERROR" == "0" ] if [ ! "$ERROR" == "0" ]
then then
echo -e "Status:\t\tError - something went wrong." >> "$ITEM_LOG_FILE" echo -e "Status:\t\tFAILURE" >> "$ITEM_LOG_FILE"
else else
echo -e "Status:\t\tSuccess - item has been processed." >> "$ITEM_LOG_FILE" echo -e "Status:\t\tSUCCESS" >> "$ITEM_LOG_FILE"
fi fi
#Remove the item after it has been processed as not to fill up disk space. #Remove the item after it has been processed as not to fill up disk space.
@ -1500,7 +1500,6 @@ listen_for_job () {
then then
kill "$SSH_MASTER_PID" #>> /dev/null 2>&1 kill "$SSH_MASTER_PID" #>> /dev/null 2>&1
fi fi
cleanup
log INFO "Finished. Consult ./$JOB_LOG_DIR for job output." log INFO "Finished. Consult ./$JOB_LOG_DIR for job output."
break break
else else
@ -1526,6 +1525,7 @@ listen_for_job () {
set_status STOPPED set_status STOPPED
log DEBUG "Listener stopped." log DEBUG "Listener stopped."
cleanup
exit exit
} }
@ -1604,7 +1604,7 @@ show_status () {
if [ ! "$NODE" == "UNKNOWN" ] if [ ! "$NODE" == "UNKNOWN" ]
then then
STATUS=`get_status_of_node "$x" | awk '{ print $2 }'` STATUS=`get_status_of_node "$x" | awk '{ print $2 }'`
RES=`exec_cmd "grep -i $NODE ~/$PPSS_HOME_DIR/$JOB_LOG_DIR/* | wc -l "` RES=`exec_cmd "grep -i $NODE ~/$PPSS_HOME_DIR/$JOB_LOG_DIR/* 2>/dev/null | wc -l "`
if [ ! "$?" == "0" ] if [ ! "$?" == "0" ]
then then
RES=0 RES=0