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

Fixed some bugs

This commit is contained in:
Louwrentius 2011-02-13 22:53:30 +00:00
parent c07e95b2a2
commit 2946abc3d6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ppss
View File

@ -26,7 +26,7 @@
trap 'kill_process' SIGINT trap 'kill_process' SIGINT
SCRIPT_NAME="Distributed Parallel Processing Shell Script" SCRIPT_NAME="Distributed Parallel Processing Shell Script"
SCRIPT_VERSION="2.85" SCRIPT_VERSION="2.86"
# #
# The first argument to this script can be a mode. # The first argument to this script can be a mode.
@ -119,7 +119,7 @@ REMOTE_OUTPUT_DIR="" # Remote directory to which output must
SCRIPT="" # Custom user script that is executed by ppss. SCRIPT="" # Custom user script that is executed by ppss.
ITEM_ESCAPED="" ITEM_ESCAPED=""
DISABLE_SKIPPING=0 DISABLE_SKIPPING=0
NODE_STATUS="$PPSS_DIR/status.txt" NODE_STATUS="$PPSS_DIR/$HOSTNAME-status.txt"
DAEMON=0 DAEMON=0
EMAIL="" EMAIL=""
@ -373,6 +373,11 @@ exec_cmd () {
CMD="$1" CMD="$1"
NOMP="$2" # Disable multiplexing. NOMP="$2" # Disable multiplexing.
if [[ "$ARCH" == "FreeBSD" ]]
then
CMD="bash $CMD"
fi
if [ ! -z "$SSH_SERVER" ] if [ ! -z "$SSH_SERVER" ]
then then
if [ -z "$NOMP" ] if [ -z "$NOMP" ]
@ -2677,7 +2682,8 @@ start_all_workers () {
get_status_of_node () { get_status_of_node () {
NODE="$1" NODE="$1"
STATUS=`ssh -o ConnectTimeout=10 $SSH_KEY $USER@$NODE cat "$PPSS_HOME_DIR/$NODE_STATUS" 2>/dev/null` NODE_HOSTNAME=`ssh -o ConnectTimeout=10 $SSH_KEY $USER@NODE hostname`
STATUS=`ssh -o ConnectTimeout=10 $SSH_KEY $USER@$NODE cat "$PPSS_HOME_DIR/$NODE_HOSTNAME-status.txt" 2>/dev/null`
ERROR="$?" ERROR="$?"
if [ ! "$ERROR" == "0" ] if [ ! "$ERROR" == "0" ]
then then

2
ppss-test.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
DEBUG="$1" DEBUG="$1"
VERSION="2.85" VERSION="2.86"
TMP_DIR="/tmp/ppss" TMP_DIR="/tmp/ppss"
PPSS=./ppss PPSS=./ppss
PPSS_DIR=ppss_dir PPSS_DIR=ppss_dir