work on #2425 : added a SingleJVM mode and support for update.rc-d

- the proactive-scheduler service can now start nodes in SingleJVM mode (multiple ProActive Nodes for one JVM)
- Make use of update.rc-d when the use of chkconfig fails
(cherry picked from commit ec5414d)

Author: fviale

tools/install.sh

@@ -88,7 +88,6 @@ read -e -p "Port used by the proactive server: " -i "8080" PORT
 PORT=$(echo $PORT | xargs)
 
 read -e -p "Number of ProActive nodes to start on the server machine: " -i "4" NB_NODES
-
 NB_NODES=$(echo $NB_NODES | xargs)
 
 if confirm "Setup cron task for cleaning old logs? [Y/n] " ; then
@@ -114,6 +113,10 @@ sed "s/PORT=.*/PORT=$PORT/g"  -i "/etc/init.d/proactive-scheduler"
 sed "s/NB_NODES=.*/NB_NODES=$NB_NODES/g"  -i "/etc/init.d/proactive-scheduler"
 sed "s/PA_ROOT=.*/PA_ROOT=$(escape_rhs_sed "$PA_ROOT")/g"  -i "/etc/init.d/proactive-scheduler"
 
+if confirm "Start ProActive Nodes in a single JVM process (y) or multiple JVM Processes (n) ? [Y/n] " ; then
+    sed "s/SINGLE_JVM=.*/SINGLE_JVM=true/g"  -i "/etc/init.d/proactive-scheduler"
+fi
+
 chmod 700 /etc/init.d/proactive-scheduler
 
 mkdir -p /var/log/proactive
@@ -122,7 +125,11 @@ touch /var/log/proactive/scheduler
 chown -R $USER:$USER /var/log/proactive
 
 if confirm "Start the proactive-scheduler service at startup? [Y/n] " ; then
-    chkconfig proactive-scheduler on
+    if chkconfig proactive-scheduler on 2> /dev/null ; then
+        echo "proactive-scheduler service added as a startup daemon"
+    else
+        update-rc.d proactive-scheduler defaults
+    fi
 fi
 
 

tools/proactive-scheduler

@@ -16,6 +16,7 @@ PORT=8080
 NB_NODES=1
 ALIAS=$(hostname)
 PA_ROOT=/opt/proactive
+SINGLE_JVM=false
 
 
 # e,d of variables to modify
@@ -26,15 +27,21 @@ export PROACTIVE_HOME=$PA_ROOT/default
 NAME=proactive-scheduler
 #THE COMMAND TO LAUNCH
 
-DAEMON="$PROACTIVE_HOME/bin/proactive-server -ln $NB_NODES"
+if $SINGLE_JVM ; then
+	DAEMON="$PROACTIVE_HOME/bin/proactive-server -ln 0"
+else
+	DAEMON="$PROACTIVE_HOME/bin/proactive-server -ln $NB_NODES"
+fi
 
 #File where log will be placed (/dev/null if empty)
 LOGFILE=/var/log/proactive/scheduler
 #File where pid will be store, leave as is if you don't know what you do
 PIDFILE=/var/run/$NAME.pid
+NODE_PIDFILE=/var/run/$NAME_node.pid
 
 REST_URL=$PROTOCOL://localhost:$PORT/rest
 REST_PUBLIC_URL=$PROTOCOL://${ALIAS}:$PORT/rest
+PA_URL=pnp://${ALIAS}:64738
 
 processRunning() {
 		kill -0 $1 &> /dev/null
@@ -68,6 +75,29 @@ waitForCompletion() {
 	done
 }
 
+createnodes() {
+    echo Creating local nodes ...
+    PA_PROTOCOL=$(grep 'proactive.communication.protocol' "$PROACTIVE_HOME/config/network/server.ini" | sed "s/proactive\.communication\.protocol=\(.*\)/\1/g")
+    if [[ "$PA_PROTOCOL" == "pnp" ]]; then
+        PA_URL=pnp://${ALIAS}:64738
+    elif [[ "$PA_PROTOCOL" == "pamr" ]]; then
+    	PA_URL=pamr://0
+    else
+    	PA_URL=pnp://${ALIAS}:64738
+    fi
+
+	CMD="nohup $PROACTIVE_HOME/bin/proactive-node -w $NB_NODES -f $PROACTIVE_HOME/config/authentication/rm.cred -s Default -r $PA_URL &> /dev/null & "
+	if [ "$USER" != "" ]
+        then
+        	$(su $USER -c "$CMD")
+        else
+        	$(su -c "cd $PROACTIVE_HOME/bin && $CMD")
+        fi
+        CURRPID=$(ps aux|grep RMNodeStarter|grep -v "grep"|awk '{ print $2 }')
+        echo $CURRPID > $NODE_PIDFILE
+}
+
+
 
 
 start() {
@@ -110,6 +140,10 @@ start() {
         		done
 			echo Web interfaces started at $PROTOCOL://${ALIAS}:$PORT
 
+			if $SINGLE_JVM ; then
+				createnodes
+            fi
+
 			echo -e "Service $NAME \e[0;32mSTARTED\e[0m"
 
 	else
@@ -131,6 +165,10 @@ stop() {
 	then
 		# kill scheduler process
 		kill $CURRPID
+		if $SINGLE_JVM ; then
+			NODEPID=$(cat $NODE_PIDFILE)
+			kill $NODEPID
+		fi
 		waitForCompletion
 		echo -e "Service $NAME : \e[0;31mSTOPPED\e[0m"
 	else