Commit f97e32b0 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/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
parents 285bb899 2a00c516

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+15 −2
Original line number Diff line number Diff line
@@ -1078,12 +1078,25 @@ Cmvmi::execDUMP_STATE_ORD(Signal* signal) 
	      g_sectionSegmentPool.getNoOfFree());

  }

  

  if (dumpState->args[0] == DumpStateOrd::CmvmiSetRestartOnErrorInsert){

  if (dumpState->args[0] == DumpStateOrd::CmvmiSetRestartOnErrorInsert)

  {

    if(signal->getLength() == 1)

      theConfig.setRestartOnErrorInsert((int)NRT_NoStart_Restart);

    {

      Uint32 val = (Uint32)NRT_NoStart_Restart;

      const ndb_mgm_configuration_iterator * p = 

	theConfig.getOwnConfigIterator();

      ndbrequire(p != 0);

      

      if(!ndb_mgm_get_int_parameter(p, CFG_DB_STOP_ON_ERROR_INSERT, &val))

      {

	theConfig.setRestartOnErrorInsert(val);

      }

    }

    else

    {

      theConfig.setRestartOnErrorInsert(signal->theData[1]);

    }

  }



  if (dumpState->args[0] == DumpStateOrd::CmvmiTestLongSigWithDelay) {

    unsigned i;

ndb/test/ndbapi/testNodeRestart.cpp

+12 −0
Original line number Diff line number Diff line
@@ -433,6 +433,11 @@ int runBug15587(NDBT_Context* ctx, NDBT_Step* step){ 
  if (restarter.waitNodesNoStart(&nodeId, 1))

    return NDBT_FAILED; 

   

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

  

  if (restarter.dumpStateOneNode(nodeId, val2, 2))

    return NDBT_FAILED;



  if (restarter.dumpStateOneNode(nodeId, dump, 2))

    return NDBT_FAILED;
@@ -444,6 +449,9 @@ int runBug15587(NDBT_Context* ctx, NDBT_Step* step){ 
  if (restarter.waitNodesNoStart(&nodeId, 1))

    return NDBT_FAILED; 

   

  if (restarter.dumpStateOneNode(nodeId, val2, 1))

    return NDBT_FAILED;

  

  if (restarter.startNodes(&nodeId, 1))

    return NDBT_FAILED;
@@ -626,6 +634,10 @@ runBug18414(NDBT_Context* ctx, NDBT_Step* step){ 
	goto err;

    }

    

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

    if (restarter.dumpStateOneNode(node2, val2, 2))

      goto err;

    

    if (restarter.insertErrorInNode(node2, 5003))

      goto err;

ndb/test/src/NdbBackup.cpp

+2 −2
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ NdbBackup::NF(NdbRestarter& _restarter, int *NFDuringBackup_codes, const int sz, 
	   << masterNodeId << endl;





    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;

    CHECK(_restarter.dumpStateOneNode(nodeId, &val, 1) == 0,

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

    CHECK(_restarter.dumpStateOneNode(nodeId, val, 2) == 0,

	  "failed to set RestartOnErrorInsert");

    CHECK(_restarter.insertErrorInNode(nodeId, error) == 0,

	  "failed to set error insert");

ndb/test/src/NdbRestarts.cpp

+8 −8
Original line number Diff line number Diff line
@@ -641,8 +641,8 @@ int restartNFDuringNR(NdbRestarter& _restarter, 
    CHECK(_restarter.waitNodesNoStart(&nodeId, 1) == 0,

	  "waitNodesNoStart failed");

    

    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;

    CHECK(_restarter.dumpStateOneNode(nodeId, &val, 1) == 0,

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

    CHECK(_restarter.dumpStateOneNode(nodeId, val, 2) == 0,

	  "failed to set RestartOnErrorInsert");

    

    CHECK(_restarter.insertErrorInNode(nodeId, error) == 0,
@@ -698,8 +698,8 @@ int restartNFDuringNR(NdbRestarter& _restarter, 
    CHECK(_restarter.waitNodesNoStart(&nodeId, 1) == 0,

	  "waitNodesNoStart failed");

        

    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;

    CHECK(_restarter.dumpStateOneNode(crashNodeId, &val, 2) == 0,

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

    CHECK(_restarter.dumpStateOneNode(crashNodeId, val, 2) == 0,

	  "failed to set RestartOnErrorInsert");

    

    CHECK(_restarter.insertErrorInNode(crashNodeId, error) == 0,
@@ -771,8 +771,8 @@ int restartNodeDuringLCP(NdbRestarter& _restarter, 
	   << " error code = " << error << endl;



    {

      int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;

      CHECK(_restarter.dumpStateAllNodes(&val, 1) == 0,

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

      CHECK(_restarter.dumpStateAllNodes(val, 2) == 0,

	    "failed to set RestartOnErrorInsert");

    }
@@ -812,8 +812,8 @@ int restartNodeDuringLCP(NdbRestarter& _restarter, 
    ndbout << _restart->m_name << " restarting non-master node = " << nodeId

	   << " error code = " << error << endl;



    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;

    CHECK(_restarter.dumpStateAllNodes(&val, 1) == 0,

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

    CHECK(_restarter.dumpStateAllNodes(val, 2) == 0,

	  "failed to set RestartOnErrorInsert");

    

    CHECK(_restarter.insertErrorInNode(nodeId, error) == 0,