Commit f98f5d63 authored by unknown's avatar unknown
Browse files

ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) 


ndb/include/kernel/GlobalSignalNumbers.h:
  5.0 : add NODE_START_REP from 5.1
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.hpp:
  5.0 : add NODE_START_REP from 5.1
parent a182963c

ndb/include/kernel/GlobalSignalNumbers.h

+1 −0
Original line number Diff line number Diff line
@@ -587,6 +587,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_BLOCK_COMMIT_ORD            485

#define GSN_UNBLOCK_COMMIT_ORD          486



#define GSN_NODE_START_REP              502

#define GSN_NODE_STATE_REP              487

#define GSN_CHANGE_NODE_STATE_REQ       488

#define GSN_CHANGE_NODE_STATE_CONF      489

ndb/src/common/debugger/signaldata/SignalNames.cpp

+2 −0
Original line number Diff line number Diff line
@@ -399,6 +399,8 @@ const GsnName SignalNames [] = { 
  ,{ GSN_TUP_COM_UNBLOCK,        "TUP_COM_UNBLOCK" }

  ,{ GSN_DUMP_STATE_ORD,         "DUMP_STATE_ORD" }



  ,{ GSN_NODE_START_REP, "NODE_START_REP" }



  ,{ GSN_START_INFOREQ,  "START_INFOREQ" }

  ,{ GSN_START_INFOREF,  "START_INFOREF" }

  ,{ GSN_START_INFOCONF, "START_INFOCONF" }

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

+7 −0
Original line number Diff line number Diff line
@@ -592,6 +592,13 @@ Ndbcntr::execCNTR_START_REP(Signal* signal){ 
  c_startedNodes.set(nodeId);

  c_start.m_starting.clear(nodeId);



  /**

   * Inform all interested blocks that node has started

   */

  for(Uint32 i = 0; i<ALL_BLOCKS_SZ; i++){

    sendSignal(ALL_BLOCKS[i].Ref, GSN_NODE_START_REP, signal, 1, JBB);

  }

  

  if(!c_start.m_starting.isclear()){

    jam();

    return;

ndb/src/kernel/vm/SimulatedBlock.cpp

+6 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ SimulatedBlock::installSimulatedBlockFunctions(){ 
  a[GSN_FSREMOVEREF]  = &SimulatedBlock::execFSREMOVEREF;

  a[GSN_FSSYNCREF]    = &SimulatedBlock::execFSSYNCREF;

  a[GSN_FSAPPENDREF]  = &SimulatedBlock::execFSAPPENDREF;

  a[GSN_NODE_START_REP] = &SimulatedBlock::execNODE_START_REP;

}



void
@@ -913,6 +914,11 @@ SimulatedBlock::execCONTINUE_FRAGMENTED(Signal * signal){ 
  sendSignal(reference(), GSN_CONTINUE_FRAGMENTED, signal, 1, JBB);

}



void

SimulatedBlock::execNODE_START_REP(Signal* signal)

{

}



#ifdef VM_TRACE_TIME

void

SimulatedBlock::clearTimes() {

ndb/src/kernel/vm/SimulatedBlock.hpp

+1 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ private: 


  void execSIGNAL_DROPPED_REP(Signal* signal);

  void execCONTINUE_FRAGMENTED(Signal* signal);

  void execNODE_START_REP(Signal* signal);



  Uint32 c_fragmentIdCounter;

  ArrayPool<FragmentInfo> c_fragmentInfoPool;