Commit b642e268 authored by unknown's avatar unknown
Browse files

ndb - bug#24717 

  fixes to testprogram to test new impl. in 5.1


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  move tsman dumps
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add more support for connection handling using dumps
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  port testprogram to 5.1 to avoid "extra" safety net in LQH
parent 9a22200e

storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public: 
    TuxSetLogFlags = 12002,

    TuxMetaDataJunk = 12009,

    

    DumpTsman = 9002, 

    DumpTsman = 9800, 

    DumpLgman = 10000,

    DumpPgman = 11000

  };

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

+9 −5
Original line number Diff line number Diff line
@@ -578,6 +578,7 @@ void Cmvmi::execCONNECT_REP(Signal *signal){ 
      /**

       * Dont allow api nodes to connect

       */

      ndbout_c("%d %d %d", hostId, type, globalData.theStartLevel);

      abort();

      globalTransporterRegistry.do_disconnect(hostId);

    }
@@ -1208,6 +1209,8 @@ Cmvmi::execDUMP_STATE_ORD(Signal* signal) 
  if (arg == 9001)

  {

    CLEAR_ERROR_INSERT_VALUE;

    if (signal->getLength() == 1 || signal->theData[1])

    {

      for (Uint32 i = 0; i<MAX_NODES; i++)

      {

	if (c_error_9000_nodes_mask.get(i))
@@ -1217,6 +1220,7 @@ Cmvmi::execDUMP_STATE_ORD(Signal* signal) 
	  EXECUTE_DIRECT(CMVMI, GSN_OPEN_COMREQ, signal, 2);

	}

      }

    }

    c_error_9000_nodes_mask.clear();

  }

#endif

storage/ndb/test/ndbapi/testNodeRestart.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){ 
  

  HugoTransactions hugoTrans(*ctx->getTab());



  int dump[] = { 9002, 0 } ;

  int dump[] = { 9000, 0 } ;

  Uint32 ownNode = refToNode(pNdb->getReference());

  dump[1] = ownNode;
@@ -1025,6 +1025,8 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){ 
      hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead);

    }

    

    int reset[2] = { 9001, 0 };

    restarter.dumpStateOneNode(nodeId, reset, 2);

    restarter.waitClusterStarted();

  }