database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity

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

Browse Source
This commit is contained in:
pekka@orca.ndb.mysql.com
2006-07-10 13:44:15 +02:00
parent ada3df7026
commit 7c83e6d201
5 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ndb/include/kernel/GlobalSignalNumbers.h
View File

@@ -587,6 +587,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
#define GSN_BLOCK_COMMIT_ORD 485 #define GSN_BLOCK_COMMIT_ORD 485
#define GSN_UNBLOCK_COMMIT_ORD 486 #define GSN_UNBLOCK_COMMIT_ORD 486
#define GSN_NODE_START_REP 502
#define GSN_NODE_STATE_REP 487 #define GSN_NODE_STATE_REP 487
#define GSN_CHANGE_NODE_STATE_REQ 488 #define GSN_CHANGE_NODE_STATE_REQ 488
#define GSN_CHANGE_NODE_STATE_CONF 489 #define GSN_CHANGE_NODE_STATE_CONF 489

2
ndb/src/common/debugger/signaldata/SignalNames.cpp
View File

@@ -399,6 +399,8 @@ const GsnName SignalNames [] = {
,{ GSN_TUP_COM_UNBLOCK, "TUP_COM_UNBLOCK" } ,{ GSN_TUP_COM_UNBLOCK, "TUP_COM_UNBLOCK" }
,{ GSN_DUMP_STATE_ORD, "DUMP_STATE_ORD" } ,{ GSN_DUMP_STATE_ORD, "DUMP_STATE_ORD" }
,{ GSN_NODE_START_REP, "NODE_START_REP" }
,{ GSN_START_INFOREQ, "START_INFOREQ" } ,{ GSN_START_INFOREQ, "START_INFOREQ" }
,{ GSN_START_INFOREF, "START_INFOREF" } ,{ GSN_START_INFOREF, "START_INFOREF" }
,{ GSN_START_INFOCONF, "START_INFOCONF" } ,{ GSN_START_INFOCONF, "START_INFOCONF" }

7
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
View File

@@ -591,6 +591,13 @@ Ndbcntr::execCNTR_START_REP(Signal* signal){
Uint32 nodeId = signal->theData[0]; Uint32 nodeId = signal->theData[0];
c_startedNodes.set(nodeId); c_startedNodes.set(nodeId);
c_start.m_starting.clear(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()){ if(!c_start.m_starting.isclear()){
jam(); jam();

6
ndb/src/kernel/vm/SimulatedBlock.cpp
View File

@@ -148,6 +148,7 @@ SimulatedBlock::installSimulatedBlockFunctions(){
a[GSN_FSREMOVEREF] = &SimulatedBlock::execFSREMOVEREF; a[GSN_FSREMOVEREF] = &SimulatedBlock::execFSREMOVEREF;
a[GSN_FSSYNCREF] = &SimulatedBlock::execFSSYNCREF; a[GSN_FSSYNCREF] = &SimulatedBlock::execFSSYNCREF;
a[GSN_FSAPPENDREF] = &SimulatedBlock::execFSAPPENDREF; a[GSN_FSAPPENDREF] = &SimulatedBlock::execFSAPPENDREF;
a[GSN_NODE_START_REP] = &SimulatedBlock::execNODE_START_REP;
} }
void void
@@ -913,6 +914,11 @@ SimulatedBlock::execCONTINUE_FRAGMENTED(Signal * signal){
sendSignal(reference(), GSN_CONTINUE_FRAGMENTED, signal, 1, JBB); sendSignal(reference(), GSN_CONTINUE_FRAGMENTED, signal, 1, JBB);
} }
void
SimulatedBlock::execNODE_START_REP(Signal* signal)
{
}
#ifdef VM_TRACE_TIME #ifdef VM_TRACE_TIME
void void
SimulatedBlock::clearTimes() { SimulatedBlock::clearTimes() {

1
ndb/src/kernel/vm/SimulatedBlock.hpp
View File

@@ -423,6 +423,7 @@ private:
void execSIGNAL_DROPPED_REP(Signal* signal); void execSIGNAL_DROPPED_REP(Signal* signal);
void execCONTINUE_FRAGMENTED(Signal* signal); void execCONTINUE_FRAGMENTED(Signal* signal);
void execNODE_START_REP(Signal* signal);
Uint32 c_fragmentIdCounter; Uint32 c_fragmentIdCounter;
ArrayPool<FragmentInfo> c_fragmentInfoPool; ArrayPool<FragmentInfo> c_fragmentInfoPool;