Commit 1b995b86 authored by Fabien Viale's avatar Fabien Viale
Browse files

Fix NodeRecovery eligible status

 - use of setEligibleNodesToRecover in NodesRecoveryManager means that if several node sources are present, the set of eligible nodes is overwritten.
 - replaced by a list add method
 - additionnally, in proactive-scheduler service definition fix the node name parameter.
parent 57b023c1
......@@ -1047,8 +1047,8 @@ public class RMCore implements ResourceManager, InitActive, RunActive {
}, preemptive, isTriggeredFromShutdownHook));
}
public void setEligibleNodesToRecover(List<RMNode> eligibleNodes) {
this.eligibleNodes = eligibleNodes;
public void addEligibleNodesToRecover(List<RMNode> eligibleNodes) {
this.eligibleNodes.addAll(eligibleNodes);
}
private final class RemoveAllNodes implements Function<NodeSource, Void> {
......
......@@ -181,7 +181,7 @@ public class NodesRecoveryManager {
}
}
nodeRecoveryThreadPool.shutdownNow();
this.rmCore.setEligibleNodesToRecover(recoveredEligibleNodes);
this.rmCore.addEligibleNodesToRecover(recoveredEligibleNodes);
this.logNodeRecoverySummary(nodeSourceName, recoveredNodeStatesCounter, recoveredEligibleNodes.size());
}
......
......@@ -89,7 +89,7 @@ createnodes() {
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 & "
CMD="nohup $PROACTIVE_HOME/bin/proactive-node -w $NB_NODES -f $PROACTIVE_HOME/config/authentication/rm.cred -s Default -n $HOSTNAME -r $PA_URL &> /dev/null & "
if [ "$USER" != "" ]
then
$(su $USER -c "$CMD")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment