Commit d0bd2688 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work 

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
parents ad2a2f57 3d7cb87b

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+1 −0
Original line number Diff line number Diff line
@@ -8432,6 +8432,7 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){ 
      }

      replicaPtr.i = nextReplicaPtrI;

    }//while

    updateNodeInfo(fragPtr);

  }

}

ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

+6 −1
Original line number Diff line number Diff line
@@ -2042,6 +2042,11 @@ void Ndbcntr::execSET_VAR_REQ(Signal* signal) { 
void Ndbcntr::updateNodeState(Signal* signal, const NodeState& newState) const{

  NodeStateRep * const stateRep = (NodeStateRep *)&signal->theData[0];



  if (newState.startLevel == NodeState::SL_STARTED)

  {

    CRASH_INSERTION(1000);

  }



  stateRep->nodeState = newState;

  stateRep->nodeState.masterNodeId = cmasterNodeId;

  stateRep->nodeState.setNodeGroup(c_nodeGroup);

ndb/test/ndbapi/testSystemRestart.cpp

+47 −0
Original line number Diff line number Diff line
@@ -1121,6 +1121,46 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ 
  return NDBT_OK;

}



int 

runBug21536(NDBT_Context* ctx, NDBT_Step* step)

{

  NdbRestarter restarter;

  const Uint32 nodeCount = restarter.getNumDbNodes();

  if(nodeCount != 2){

    g_info << "Bug21536 - 2 nodes to test" << endl;

    return NDBT_OK;

  }



  int node1 = restarter.getDbNodeId(rand() % nodeCount);

  int node2 = restarter.getRandomNodeSameNodeGroup(node1, rand());



  if (node1 == -1 || node2 == -1)

    return NDBT_OK;

  

  int result = NDBT_OK;

  do {

    CHECK(restarter.restartOneDbNode(node1, false, true, true) == 0);

    CHECK(restarter.waitNodesNoStart(&node1, 1) == 0);    

    CHECK(restarter.insertErrorInNode(node1, 1000) == 0);    

    int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };

    CHECK(restarter.dumpStateOneNode(node1, val2, 2) == 0);

    CHECK(restarter.startNodes(&node1, 1) == 0);    

    restarter.waitNodesStartPhase(&node1, 1, 3, 120);

    CHECK(restarter.waitNodesNoStart(&node1, 1) == 0);    

    

    CHECK(restarter.restartOneDbNode(node2, true, true, true) == 0);

    CHECK(restarter.waitNodesNoStart(&node2, 1) == 0);    

    CHECK(restarter.startNodes(&node1, 1) == 0);   

    CHECK(restarter.waitNodesStarted(&node1, 1) == 0);

    CHECK(restarter.startNodes(&node2, 1) == 0);   

    CHECK(restarter.waitClusterStarted() == 0);



  } while(0);

  

  g_info << "Bug21536 finished" << endl;  

  

  return result;

}



NDBT_TESTSUITE(testSystemRestart);

TESTCASE("SR1",
@@ -1287,6 +1327,13 @@ TESTCASE("Bug18385", 
  STEP(runBug18385);

  FINALIZER(runClearTable);

}

TESTCASE("Bug21536", 

	 "Perform partition system restart with other nodes with higher GCI"){

  INITIALIZER(runWaitStarted);

  INITIALIZER(runClearTable);

  STEP(runBug21536);

  FINALIZER(runClearTable);

}

NDBT_TESTSUITE_END(testSystemRestart);



int main(int argc, const char** argv){