Commit 610b3d29 authored by joreland@mysql.com's avatar joreland@mysql.com

testSystemRestart -n SR1

Handle arbit during system shutdown
parent 4b13824c
...@@ -2313,6 +2313,18 @@ void Ndbcntr::execWAIT_GCP_REF(Signal* signal){ ...@@ -2313,6 +2313,18 @@ void Ndbcntr::execWAIT_GCP_REF(Signal* signal){
void Ndbcntr::execWAIT_GCP_CONF(Signal* signal){ void Ndbcntr::execWAIT_GCP_CONF(Signal* signal){
jamEntry(); jamEntry();
ndbrequire(StopReq::getSystemStop(c_stopRec.stopReq.requestInfo));
NodeState newState(NodeState::SL_STOPPING_3, true);
/**
* Inform QMGR so that arbitrator won't kill us
*/
NodeStateRep * rep = (NodeStateRep *)&signal->theData[0];
rep->nodeState = newState;
rep->nodeState.masterNodeId = cmasterNodeId;
rep->nodeState.setNodeGroup(c_nodeGroup);
EXECUTE_DIRECT(QMGR, GSN_NODE_STATE_REP, signal, NodeStateRep::SignalLength);
if(StopReq::getPerformRestart(c_stopRec.stopReq.requestInfo)){ if(StopReq::getPerformRestart(c_stopRec.stopReq.requestInfo)){
jam(); jam();
StartOrd * startOrd = (StartOrd *)&signal->theData[0]; StartOrd * startOrd = (StartOrd *)&signal->theData[0];
......
...@@ -2311,6 +2311,15 @@ void Qmgr::execPREP_FAILCONF(Signal* signal) ...@@ -2311,6 +2311,15 @@ void Qmgr::execPREP_FAILCONF(Signal* signal)
* Continues via sendCommitFailReq() if successful. * Continues via sendCommitFailReq() if successful.
*/ */
arbitRec.failureNr = cfailureNr; arbitRec.failureNr = cfailureNr;
const NodeState & s = getNodeState();
if(s.startLevel == NodeState::SL_STOPPING_3 && s.stopping.systemShutdown){
jam();
/**
* We're performing a system shutdown,
* don't let artibtrator shut us down
*/
return;
}
handleArbitCheck(signal); handleArbitCheck(signal);
return; return;
}//Qmgr::execPREP_FAILCONF() }//Qmgr::execPREP_FAILCONF()
......
...@@ -794,3 +794,39 @@ max-time: 300 ...@@ -794,3 +794,39 @@ max-time: 300
cmd: testBlobs cmd: testBlobs
args: args:
max-time: 2500
cmd: testOIBasic
args:
#
#
# SYSTEM RESTARTS
#
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T1
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T6
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T7
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T8
max-time: 1500
cmd: testSystemRestart
args: -n SR2 T1
max-time: 1500
cmd: testSystemRestart
args: -n SR2 T6
max-time: 1500
cmd: testSystemRestart
args: -n SR2 T7
...@@ -37,34 +37,6 @@ args: -n SingleUserMode T1 ...@@ -37,34 +37,6 @@ args: -n SingleUserMode T1
# #
# SYSTEM RESTARTS # SYSTEM RESTARTS
# #
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T1
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T6
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T7
max-time: 1500
cmd: testSystemRestart
args: -n SR1 T8
max-time: 1500
cmd: testSystemRestart
args: -n SR2 T1
max-time: 1500
cmd: testSystemRestart
args: -n SR2 T6
max-time: 1500
cmd: testSystemRestart
args: -n SR2 T7
max-time: 1500 max-time: 1500
cmd: testSystemRestart cmd: testSystemRestart
args: -n SR_UNDO T1 args: -n SR_UNDO T1
...@@ -230,7 +202,3 @@ max-time: 2500 ...@@ -230,7 +202,3 @@ max-time: 2500
cmd: test_event cmd: test_event
args: -n BasicEventOperation T1 T6 args: -n BasicEventOperation T1 T6
max-time: 2500
cmd: testOIBasic
args:
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