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

Improved error handling and messages.

This commit is contained in:
Louwrentius 2009-08-09 16:40:09 +00:00
parent e682a131c7
commit e1062f517b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
branches/distributed-ppss/ppss.sh
View File

@ -88,6 +88,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=""
NODE_STATUS="status.txt" NODE_STATUS="status.txt"
FORCE="no"
showusage () { showusage () {
@ -138,6 +139,10 @@ showusage () {
echo -e "--processes | -p Start the specified number of processes. Ignore the number of available" echo -e "--processes | -p Start the specified number of processes. Ignore the number of available"
echo -e " CPU's." echo -e " CPU's."
echo echo
echo -e "--force | -F Force PPSS to run, even anoter instance of PPSS is already running."
echo " Please note that any running PPSS instance will not exit anymore if"
echo " you start multiple instances, although they will run fine."
echo
echo -e "The following options are used for distributed execution of PPSS." echo -e "The following options are used for distributed execution of PPSS."
echo echo
echo -e "--server | -s Specifies the SSH server that is used for communication between nodes." echo -e "--server | -s Specifies the SSH server that is used for communication between nodes."
@ -416,6 +421,11 @@ do
add_var_to_config LOGFILE "$LOGFILE" add_var_to_config LOGFILE "$LOGFILE"
shift 2 shift 2
;; ;;
--force|-F )
FORCE=yes
add_var_to_config FORCE "$FORCE"
shift 1
;;
--key|-k ) --key|-k )
SSH_KEY="$2" SSH_KEY="$2"
add_var_to_config SSH_KEY "$SSH_KEY" add_var_to_config SSH_KEY "$SSH_KEY"
@ -499,9 +509,10 @@ check_for_running_instances () {
MIN_JOBS=2 MIN_JOBS=2
fi fi
if [ "$JOBS" -gt "$MIN_JOBS" ] if [ "$JOBS" -gt "$MIN_JOBS" ] && [ "$FORCE" == "no" ]
then then
log ERROR "Cannot run PPSS because there is another running instances of PPSS detected. See log for more details." log ERROR "Cannot run PPSS because there is another running instances of PPSS detected. See log for more details."
log ERROR "Use -F to override. Please note that all running PPSS instances will never quit if you do."
if [ "$ARCH" == "Darwin" ] if [ "$ARCH" == "Darwin" ]
then then
TMP=`ps aux -j | grep -v grep | grep ${USER} | grep -v -i screen | grep ppss.sh` TMP=`ps aux -j | grep -v grep | grep ${USER} | grep -v -i screen | grep ppss.sh`
@ -513,6 +524,8 @@ check_for_running_instances () {
fi fi
cleanup cleanup
exit 2 exit 2
else
log WARN "\n\n*** Multiple instances of PPSS detected. This process will not terminate. ***\n\n"
fi fi
} }
@ -666,7 +679,7 @@ log () {
echo -e "$LOG_MSG" >> "$LOGFILE" echo -e "$LOG_MSG" >> "$LOGFILE"
if [ "$TYPE" == "INFO" ] || [ "$TYPE" == "ERROR" ] if [ "$TYPE" == "INFO" ] || [ "$TYPE" == "ERROR" ] || [ "$TYPE" == "WARN" ]
then then
echo -e "$LOG_MSG" echo -e "$LOG_MSG"
fi fi