Skip to content

M
mariadb
Commit 40d83bdf authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files
Options

ndb - wl1760/bug#18216 

  add two new start options that will decrease likelyhood of bug#18612
  push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612
parent abc9354c
Show whitespace changes
Inline Side-by-side
Showing with 733 additions and 109 deletions
ndb/include/kernel/signaldata/CmRegSignalData.hpp
View file @ 40d83bdf
...@@ -30,12 +30,17 @@ class CmRegReq { ...@@ -30,12 +30,17 @@ class CmRegReq {
friend class Qmgr; friend class Qmgr;
public: public:
STATIC_CONST( SignalLength = 3 ); STATIC_CONST( SignalLength = 5 + NdbNodeBitmask::Size );
private: private:
Uint32 blockRef; Uint32 blockRef;
Uint32 nodeId; Uint32 nodeId;
Uint32 version; // See ndb_version.h Uint32 version; // See ndb_version.h
Uint32 start_type; // As specified by cmd-line or mgm, NodeState::StartType
Uint32 latest_gci; // 0 means no fs
Uint32 skip_nodes[NdbNodeBitmask::Size]; // Nodes that does not _need_
// to be part of restart
}; };
/** /**
...@@ -59,7 +64,6 @@ private: ...@@ -59,7 +64,6 @@ private:
* The dynamic id that the node reciving this signal has * The dynamic id that the node reciving this signal has
*/ */
Uint32 dynamicId; Uint32 dynamicId;
Uint32 allNdbNodes[NdbNodeBitmask::Size]; Uint32 allNdbNodes[NdbNodeBitmask::Size];
}; };
...@@ -73,7 +77,7 @@ class CmRegRef { ...@@ -73,7 +77,7 @@ class CmRegRef {
friend class Qmgr; friend class Qmgr;
public: public:
STATIC_CONST( SignalLength = 4 ); STATIC_CONST( SignalLength = 7 + NdbNodeBitmask::Size );
enum ErrorCode { enum ErrorCode {
ZBUSY = 0, /* Only the president can send this */ ZBUSY = 0, /* Only the president can send this */
...@@ -85,14 +89,27 @@ public: ...@@ -85,14 +89,27 @@ public:
* as president. */ * as president. */
ZNOT_PRESIDENT = 5, /* We are not president */ ZNOT_PRESIDENT = 5, /* We are not president */
ZNOT_DEAD = 6, /* We are not dead when we are starting */ ZNOT_DEAD = 6, /* We are not dead when we are starting */
ZINCOMPATIBLE_VERSION = 7 ZINCOMPATIBLE_VERSION = 7,
ZINCOMPATIBLE_START_TYPE = 8
}; };
private: private:
Uint32 blockRef; Uint32 blockRef;
Uint32 nodeId; Uint32 nodeId;
Uint32 errorCode; Uint32 errorCode;
/**
* Applicable if ZELECTION
*/
Uint32 presidentCandidate; Uint32 presidentCandidate;
Uint32 candidate_latest_gci; // 0 means non
/**
* Data for sending node sending node
*/
Uint32 latest_gci;
Uint32 start_type;
Uint32 skip_nodes[NdbNodeBitmask::Size]; // Nodes that does not _need_
// to be part of restart
}; };
class CmAdd { class CmAdd {
......
ndb/include/mgmapi/ndb_logevent.h
View file @ 40d83bdf
...@@ -166,10 +166,14 @@ extern "C" { ...@@ -166,10 +166,14 @@ extern "C" {
/** NDB_MGM_EVENT_CATEGORY_BACKUP */ /** NDB_MGM_EVENT_CATEGORY_BACKUP */
NDB_LE_BackupCompleted = 56, NDB_LE_BackupCompleted = 56,
/** NDB_MGM_EVENT_CATEGORY_BACKUP */ /** NDB_MGM_EVENT_CATEGORY_BACKUP */
NDB_LE_BackupAborted = 57 NDB_LE_BackupAborted = 57,
/* 58 used in 5.1 */ /* 58 used in 5.1 */
/* 59 used */ /* 59 used */
/** NDB_MGM_EVENT_CATEGORY_STARTUP */
NDB_LE_StartReport = 60
/* 60 unused */ /* 60 unused */
/* 61 unused */ /* 61 unused */
/* 62 unused */ /* 62 unused */
...@@ -625,6 +629,13 @@ extern "C" { ...@@ -625,6 +629,13 @@ extern "C" {
unsigned type; unsigned type;
unsigned node_id; unsigned node_id;
} SingleUser; } SingleUser;
/** Log even data @ref NDB_LE_StartReport */
struct {
unsigned report_type;
unsigned remaining_time;
unsigned bitmask_size;
unsigned bitmask_data[1];
} StartReport;
#ifndef DOXYGEN_FIX #ifndef DOXYGEN_FIX
}; };
#else #else
......
ndb/src/common/debugger/EventLogger.cpp
View file @ 40d83bdf
...@@ -707,6 +707,90 @@ void getTextSingleUser(QQQQ) { ...@@ -707,6 +707,90 @@ void getTextSingleUser(QQQQ) {
} }
} }
void getTextStartReport(QQQQ) {
Uint32 time = theData[2];
Uint32 sz = theData[3];
char mask1[100];
char mask2[100];
char mask3[100];
char mask4[100];
BitmaskImpl::getText(sz, theData + 4 + (0 * sz), mask1);
BitmaskImpl::getText(sz, theData + 4 + (1 * sz), mask2);
BitmaskImpl::getText(sz, theData + 4 + (2 * sz), mask3);
BitmaskImpl::getText(sz, theData + 4 + (3 * sz), mask4);
switch(theData[1]){
case 1: // Wait initial
BaseString::snprintf
(m_text, m_text_len,
"Initial start, waiting for %s to connect, "
" nodes [ all: %s connected: %s no-wait: %s ]",
mask4, mask1, mask2, mask3);
break;
case 2: // Wait partial
BaseString::snprintf
(m_text, m_text_len,
"Waiting until nodes: %s connects, "
"nodes [ all: %s connected: %s no-wait: %s ]",
mask4, mask1, mask2, mask3);
break;
case 3: // Wait partial timeout
BaseString::snprintf
(m_text, m_text_len,
"Waiting %u sec for nodes %s to connect, "
"nodes [ all: %s connected: %s no-wait: %s ]",
time, mask4, mask1, mask2, mask3);
break;
case 4: // Wait partioned
BaseString::snprintf
(m_text, m_text_len,
"Waiting for non partitioned start, "
"nodes [ all: %s connected: %s missing: %s no-wait: %s ]",
mask1, mask2, mask4, mask3);
break;
case 5:
BaseString::snprintf
(m_text, m_text_len,
"Waiting %u sec for non partitioned start, "
"nodes [ all: %s connected: %s missing: %s no-wait: %s ]",
time, mask1, mask2, mask4, mask3);
break;
case 0x8000: // Do initial
BaseString::snprintf
(m_text, m_text_len,
"Initial start with nodes %s [ missing: %s no-wait: %s ]",
mask2, mask4, mask3);
break;
case 0x8001: // Do start
BaseString::snprintf
(m_text, m_text_len,
"Start with all nodes %s",
mask2);
break;
case 0x8002: // Do partial
BaseString::snprintf
(m_text, m_text_len,
"Start with nodes %s [ missing: %s no-wait: %s ]",
mask2, mask4, mask3);
break;
case 0x8003: // Do partioned
BaseString::snprintf
(m_text, m_text_len,
"Start potentially partitioned with nodes %s "
" [ missing: %s no-wait: %s ]",
mask2, mask4, mask3);
break;
default:
BaseString::snprintf
(m_text, m_text_len,
"Unknown startreport: 0x%x [ %s %s %s %s ]",
theData[1],
mask1, mask2, mask3, mask4);
}
}
#if 0 #if 0
BaseString::snprintf(m_text, BaseString::snprintf(m_text,
m_text_len, m_text_len,
...@@ -755,6 +839,7 @@ const EventLoggerBase::EventRepLogLevelMatrix EventLoggerBase::matrix[] = { ...@@ -755,6 +839,7 @@ const EventLoggerBase::EventRepLogLevelMatrix EventLoggerBase::matrix[] = {
ROW(StartREDOLog, LogLevel::llStartUp, 10, Logger::LL_INFO ), ROW(StartREDOLog, LogLevel::llStartUp, 10, Logger::LL_INFO ),
ROW(StartLog, LogLevel::llStartUp, 10, Logger::LL_INFO ), ROW(StartLog, LogLevel::llStartUp, 10, Logger::LL_INFO ),
ROW(UNDORecordsExecuted, LogLevel::llStartUp, 15, Logger::LL_INFO ), ROW(UNDORecordsExecuted, LogLevel::llStartUp, 15, Logger::LL_INFO ),
ROW(StartReport, LogLevel::llStartUp, 4, Logger::LL_INFO ),
// NODERESTART // NODERESTART
ROW(NR_CopyDict, LogLevel::llNodeRestart, 8, Logger::LL_INFO ), ROW(NR_CopyDict, LogLevel::llNodeRestart, 8, Logger::LL_INFO ),
......
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
View file @ 40d83bdf
...@@ -71,6 +71,7 @@ void Dbdih::initData() ...@@ -71,6 +71,7 @@ void Dbdih::initData()
cwaitLcpSr = false; cwaitLcpSr = false;
c_blockCommit = false; c_blockCommit = false;
c_blockCommitNo = 1; c_blockCommitNo = 1;
cntrlblockref = RNIL;
}//Dbdih::initData() }//Dbdih::initData()
void Dbdih::initRecords() void Dbdih::initRecords()
......
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @ 40d83bdf
...@@ -11659,7 +11659,7 @@ void Dbdih::makeNodeGroups(Uint32 nodeArray[]) ...@@ -11659,7 +11659,7 @@ void Dbdih::makeNodeGroups(Uint32 nodeArray[])
Uint32 tmngNode; Uint32 tmngNode;
Uint32 tmngNodeGroup; Uint32 tmngNodeGroup;
Uint32 tmngLimit; Uint32 tmngLimit;
Uint32 i; Uint32 i, j;
/**----------------------------------------------------------------------- /**-----------------------------------------------------------------------
* ASSIGN ALL ACTIVE NODES INTO NODE GROUPS. HOT SPARE NODES ARE ASSIGNED * ASSIGN ALL ACTIVE NODES INTO NODE GROUPS. HOT SPARE NODES ARE ASSIGNED
...@@ -11705,6 +11705,38 @@ void Dbdih::makeNodeGroups(Uint32 nodeArray[]) ...@@ -11705,6 +11705,38 @@ void Dbdih::makeNodeGroups(Uint32 nodeArray[])
Sysfile::setNodeGroup(mngNodeptr.i, SYSFILE->nodeGroups, mngNodeptr.p->nodeGroup); Sysfile::setNodeGroup(mngNodeptr.i, SYSFILE->nodeGroups, mngNodeptr.p->nodeGroup);
}//if }//if
}//for }//for
for (i = 0; i<cnoOfNodeGroups; i++)
{
jam();
bool alive = false;
NodeGroupRecordPtr NGPtr;
NGPtr.i = i;
ptrCheckGuard(NGPtr, MAX_NDB_NODES, nodeGroupRecord);
for (j = 0; j<NGPtr.p->nodeCount; j++)
{
jam();
mngNodeptr.i = NGPtr.p->nodesInGroup[j];
ptrCheckGuard(mngNodeptr, MAX_NDB_NODES, nodeRecord);
if (checkNodeAlive(NGPtr.p->nodesInGroup[j]))
{
alive = true;
break;
}
}
if (!alive)
{
char buf[255];
BaseString::snprintf
(buf, sizeof(buf),
"Illegal initial start, no alive node in nodegroup %u", i);
progError(__LINE__,
NDBD_EXIT_SR_RESTARTCONFLICT,
buf);
}
}
}//Dbdih::makeNodeGroups() }//Dbdih::makeNodeGroups()
/** /**
...@@ -12512,7 +12544,6 @@ void Dbdih::sendStartFragreq(Signal* signal, ...@@ -12512,7 +12544,6 @@ void Dbdih::sendStartFragreq(Signal* signal,
void Dbdih::setInitialActiveStatus() void Dbdih::setInitialActiveStatus()
{ {
NodeRecordPtr siaNodeptr; NodeRecordPtr siaNodeptr;
Uint32 tsiaNodeActiveStatus;
Uint32 tsiaNoActiveNodes; Uint32 tsiaNoActiveNodes;
tsiaNoActiveNodes = csystemnodes - cnoHotSpare; tsiaNoActiveNodes = csystemnodes - cnoHotSpare;
...@@ -12520,39 +12551,34 @@ void Dbdih::setInitialActiveStatus() ...@@ -12520,39 +12551,34 @@ void Dbdih::setInitialActiveStatus()
SYSFILE->nodeStatus[i] = 0; SYSFILE->nodeStatus[i] = 0;
for (siaNodeptr.i = 1; siaNodeptr.i < MAX_NDB_NODES; siaNodeptr.i++) { for (siaNodeptr.i = 1; siaNodeptr.i < MAX_NDB_NODES; siaNodeptr.i++) {
ptrAss(siaNodeptr, nodeRecord); ptrAss(siaNodeptr, nodeRecord);
if (siaNodeptr.p->nodeStatus == NodeRecord::ALIVE) { switch(siaNodeptr.p->nodeStatus){
case NodeRecord::ALIVE:
case NodeRecord::DEAD:
if (tsiaNoActiveNodes == 0) { if (tsiaNoActiveNodes == 0) {
jam(); jam();
siaNodeptr.p->activeStatus = Sysfile::NS_HotSpare; siaNodeptr.p->activeStatus = Sysfile::NS_HotSpare;
} else { } else {
jam(); jam();
tsiaNoActiveNodes = tsiaNoActiveNodes - 1; tsiaNoActiveNodes = tsiaNoActiveNodes - 1;
siaNodeptr.p->activeStatus = Sysfile::NS_Active; if (siaNodeptr.p->nodeStatus == NodeRecord::ALIVE)
}//if {
} else {
jam();
siaNodeptr.p->activeStatus = Sysfile::NS_NotDefined;
}//if
switch (siaNodeptr.p->activeStatus) {
case Sysfile::NS_Active:
jam();
tsiaNodeActiveStatus = Sysfile::NS_Active;
break;
case Sysfile::NS_HotSpare:
jam();
tsiaNodeActiveStatus = Sysfile::NS_HotSpare;
break;
case Sysfile::NS_NotDefined:
jam(); jam();
tsiaNodeActiveStatus = Sysfile::NS_NotDefined; siaNodeptr.p->activeStatus = Sysfile::NS_Active;
}
else
{
siaNodeptr.p->activeStatus = Sysfile::NS_NotActive_NotTakenOver;
}
}
break; break;
default: default:
ndbrequire(false); jam();
return; siaNodeptr.p->activeStatus = Sysfile::NS_NotDefined;
break; break;
}//switch }//if
Sysfile::setNodeStatus(siaNodeptr.i, SYSFILE->nodeStatus, Sysfile::setNodeStatus(siaNodeptr.i,
tsiaNodeActiveStatus); SYSFILE->nodeStatus,
siaNodeptr.p->activeStatus);
}//for }//for
}//Dbdih::setInitialActiveStatus() }//Dbdih::setInitialActiveStatus()
......
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
View file @ 40d83bdf
...@@ -820,17 +820,9 @@ Ndbcntr::trySystemRestart(Signal* signal){ ...@@ -820,17 +820,9 @@ Ndbcntr::trySystemRestart(Signal* signal){
return false; return false;
} }
if(!allNodes && c_start.m_startPartialTimeout > now){
jam();
return false;
}
NodeState::StartType srType = NodeState::ST_SYSTEM_RESTART; NodeState::StartType srType = NodeState::ST_SYSTEM_RESTART;
if(c_start.m_waiting.equal(c_start.m_withoutLog)){ if(c_start.m_waiting.equal(c_start.m_withoutLog))
if(!allNodes){ {
jam();
return false;
}
jam(); jam();
srType = NodeState::ST_INITIAL_START; srType = NodeState::ST_INITIAL_START;
c_start.m_starting = c_start.m_withoutLog; // Used for starting... c_start.m_starting = c_start.m_withoutLog; // Used for starting...
...@@ -860,10 +852,6 @@ Ndbcntr::trySystemRestart(Signal* signal){ ...@@ -860,10 +852,6 @@ Ndbcntr::trySystemRestart(Signal* signal){
ndbrequire(false); // All nodes -> partitioning, which is not allowed ndbrequire(false); // All nodes -> partitioning, which is not allowed
} }
if(c_start.m_startPartitionedTimeout > now){
jam();
return false;
}
break; break;
} }
......
ndb/src/kernel/blocks/qmgr/Qmgr.hpp
View file @ 40d83bdf
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#define ZAPI_HB_HANDLING 3 #define ZAPI_HB_HANDLING 3
#define ZTIMER_HANDLING 4 #define ZTIMER_HANDLING 4
#define ZARBIT_HANDLING 5 #define ZARBIT_HANDLING 5
#define ZSTART_FAILURE_LIMIT 6
/* Error Codes ------------------------------*/ /* Error Codes ------------------------------*/
#define ZERRTOOMANY 1101 #define ZERRTOOMANY 1101
...@@ -113,6 +114,17 @@ public: ...@@ -113,6 +114,17 @@ public:
Uint32 m_gsn; Uint32 m_gsn;
SignalCounter m_nodes; SignalCounter m_nodes;
Uint32 m_latest_gci;
Uint32 m_start_type;
NdbNodeBitmask m_skip_nodes;
NdbNodeBitmask m_starting_nodes;
NdbNodeBitmask m_starting_nodes_w_log;
Uint16 m_president_candidate;
Uint32 m_president_candidate_gci;
Uint16 m_regReqReqSent;
Uint16 m_regReqReqRecv;
} c_start; } c_start;
NdbNodeBitmask c_definedNodes; // DB nodes in config NdbNodeBitmask c_definedNodes; // DB nodes in config
...@@ -236,6 +248,9 @@ private: ...@@ -236,6 +248,9 @@ private:
void execREAD_NODESREF(Signal* signal); void execREAD_NODESREF(Signal* signal);
void execREAD_NODESCONF(Signal* signal); void execREAD_NODESCONF(Signal* signal);
void execDIH_RESTARTREF(Signal* signal);
void execDIH_RESTARTCONF(Signal* signal);
void execAPI_VERSION_REQ(Signal* signal); void execAPI_VERSION_REQ(Signal* signal);
void execAPI_BROADCAST_REP(Signal* signal); void execAPI_BROADCAST_REP(Signal* signal);
...@@ -252,6 +267,7 @@ private: ...@@ -252,6 +267,7 @@ private:
// Statement blocks // Statement blocks
void check_readnodes_reply(Signal* signal, Uint32 nodeId, Uint32 gsn); void check_readnodes_reply(Signal* signal, Uint32 nodeId, Uint32 gsn);
Uint32 check_startup(Signal* signal);
void node_failed(Signal* signal, Uint16 aFailedNode); void node_failed(Signal* signal, Uint16 aFailedNode);
void checkStartInterface(Signal* signal); void checkStartInterface(Signal* signal);
...@@ -374,12 +390,12 @@ private: ...@@ -374,12 +390,12 @@ private:
/* Status flags ----------------------------------*/ /* Status flags ----------------------------------*/
Uint32 c_restartPartialTimeout; Uint32 c_restartPartialTimeout;
Uint32 c_restartPartionedTimeout;
Uint32 c_restartFailureTimeout;
Uint64 c_start_election_time;
Uint16 creadyDistCom; Uint16 creadyDistCom;
Uint16 c_regReqReqSent;
Uint16 c_regReqReqRecv;
Uint64 c_stopElectionTime;
Uint16 cpresidentCandidate;
Uint16 cdelayRegreq; Uint16 cdelayRegreq;
Uint16 cpresidentAlive; Uint16 cpresidentAlive;
Uint16 cnoFailedNodes; Uint16 cnoFailedNodes;
......
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
View file @ 40d83bdf
...@@ -99,6 +99,9 @@ Qmgr::Qmgr(const class Configuration & conf) ...@@ -99,6 +99,9 @@ Qmgr::Qmgr(const class Configuration & conf)
addRecSignal(GSN_READ_NODESREF, &Qmgr::execREAD_NODESREF); addRecSignal(GSN_READ_NODESREF, &Qmgr::execREAD_NODESREF);
addRecSignal(GSN_READ_NODESCONF, &Qmgr::execREAD_NODESCONF); addRecSignal(GSN_READ_NODESCONF, &Qmgr::execREAD_NODESCONF);
addRecSignal(GSN_DIH_RESTARTREF, &Qmgr::execDIH_RESTARTREF);
addRecSignal(GSN_DIH_RESTARTCONF, &Qmgr::execDIH_RESTARTCONF);
initData(); initData();
}//Qmgr::Qmgr() }//Qmgr::Qmgr()
......
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View file @ 40d83bdf
...@@ -146,6 +146,30 @@ void Qmgr::execCONTINUEB(Signal* signal) ...@@ -146,6 +146,30 @@ void Qmgr::execCONTINUEB(Signal* signal)
runArbitThread(signal); runArbitThread(signal);
return; return;
break; break;
case ZSTART_FAILURE_LIMIT:{
if (cpresident != ZNIL)
{
jam();
return;
}
Uint64 now = NdbTick_CurrentMillisecond();
if (now > (c_start_election_time + c_restartFailureTimeout))
{
jam();
BaseString tmp;
tmp.append("Shutting down node as total restart time exceeds "
" StartFailureTimeout as set in config file ");
if(c_restartFailureTimeout == ~0)
tmp.append(" 0 (inifinite)");
else
tmp.appfmt(" %d", c_restartFailureTimeout);
progError(__LINE__, NDBD_EXIT_SYSTEM_ERROR, tmp.c_str());
}
signal->theData[0] = ZSTART_FAILURE_LIMIT;
sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 3000, 1);
return;
}
default: default:
jam(); jam();
// ZCOULD_NOT_OCCUR_ERROR; // ZCOULD_NOT_OCCUR_ERROR;
...@@ -274,13 +298,27 @@ void Qmgr::startphase1(Signal* signal) ...@@ -274,13 +298,27 @@ void Qmgr::startphase1(Signal* signal)
nodePtr.p->blockRef = reference(); nodePtr.p->blockRef = reference();
c_connectedNodes.set(nodePtr.i); c_connectedNodes.set(nodePtr.i);
signal->theData[0] = 0; // no answer signal->theData[0] = reference();
signal->theData[1] = 0; // no id sendSignal(DBDIH_REF, GSN_DIH_RESTARTREQ, signal, 1, JBB);
signal->theData[2] = NodeInfo::DB; return;
sendSignal(CMVMI_REF, GSN_OPEN_COMREQ, signal, 3, JBB); }
void
Qmgr::execDIH_RESTARTREF(Signal*signal)
{
jamEntry();
c_start.m_latest_gci = 0;
execCM_INFOCONF(signal);
}
void
Qmgr::execDIH_RESTARTCONF(Signal*signal)
{
jamEntry();
c_start.m_latest_gci = signal->theData[1];
execCM_INFOCONF(signal); execCM_INFOCONF(signal);
return;
} }
void Qmgr::setHbDelay(UintR aHbDelay) void Qmgr::setHbDelay(UintR aHbDelay)
...@@ -418,25 +456,44 @@ Qmgr::execREAD_NODESREF(Signal* signal) ...@@ -418,25 +456,44 @@ Qmgr::execREAD_NODESREF(Signal* signal)
/*******************************/ /*******************************/
void Qmgr::execCM_INFOCONF(Signal* signal) void Qmgr::execCM_INFOCONF(Signal* signal)
{ {
/**
* Open communcation to all DB nodes
*/
signal->theData[0] = 0; // no answer
signal->theData[1] = 0; // no id
signal->theData[2] = NodeInfo::DB;
sendSignal(CMVMI_REF, GSN_OPEN_COMREQ, signal, 3, JBB);
cpresident = ZNIL; cpresident = ZNIL;
cpresidentCandidate = getOwnNodeId();
cpresidentAlive = ZFALSE; cpresidentAlive = ZFALSE;
c_stopElectionTime = NdbTick_CurrentMillisecond(); c_start_election_time = NdbTick_CurrentMillisecond();
c_stopElectionTime += c_restartPartialTimeout;
signal->theData[0] = ZSTART_FAILURE_LIMIT;
sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 3000, 1);
cmInfoconf010Lab(signal); cmInfoconf010Lab(signal);
return; return;
}//Qmgr::execCM_INFOCONF() }//Qmgr::execCM_INFOCONF()
Uint32 g_start_type = 0;
NdbNodeBitmask g_nowait_nodes; // Set by clo
void Qmgr::cmInfoconf010Lab(Signal* signal) void Qmgr::cmInfoconf010Lab(Signal* signal)
{ {
c_start.m_startKey = 0; c_start.m_startKey = 0;
c_start.m_startNode = getOwnNodeId(); c_start.m_startNode = getOwnNodeId();
c_start.m_nodes.clearWaitingFor(); c_start.m_nodes.clearWaitingFor();
c_start.m_gsn = GSN_CM_REGREQ; c_start.m_gsn = GSN_CM_REGREQ;
c_start.m_starting_nodes.clear();
c_start.m_starting_nodes_w_log.clear();
c_start.m_regReqReqSent = 0;
c_start.m_regReqReqRecv = 0;
c_start.m_skip_nodes = g_nowait_nodes;
c_start.m_skip_nodes.bitAND(c_definedNodes);
c_start.m_start_type = g_start_type;
NodeRecPtr nodePtr; NodeRecPtr nodePtr;
c_regReqReqSent = c_regReqReqRecv = 0;
cnoOfNodes = 0; cnoOfNodes = 0;
for (nodePtr.i = 1; nodePtr.i < MAX_NDB_NODES; nodePtr.i++) { for (nodePtr.i = 1; nodePtr.i < MAX_NDB_NODES; nodePtr.i++) {
jam(); jam();
...@@ -471,14 +528,18 @@ void Qmgr::cmInfoconf010Lab(Signal* signal) ...@@ -471,14 +528,18 @@ void Qmgr::cmInfoconf010Lab(Signal* signal)
void void
Qmgr::sendCmRegReq(Signal * signal, Uint32 nodeId){ Qmgr::sendCmRegReq(Signal * signal, Uint32 nodeId){
c_regReqReqSent++; CmRegReq * req = (CmRegReq *)&signal->theData[0];
CmRegReq * const cmRegReq = (CmRegReq *)&signal->theData[0]; req->blockRef = reference();
cmRegReq->blockRef = reference(); req->nodeId = getOwnNodeId();
cmRegReq->nodeId = getOwnNodeId(); req->version = NDB_VERSION;
cmRegReq->version = NDB_VERSION; req->latest_gci = c_start.m_latest_gci;
req->start_type = c_start.m_start_type;
c_start.m_skip_nodes.copyto(NdbNodeBitmask::Size, req->skip_nodes);
const Uint32 ref = calcQmgrBlockRef(nodeId); const Uint32 ref = calcQmgrBlockRef(nodeId);
sendSignal(ref, GSN_CM_REGREQ, signal, CmRegReq::SignalLength, JBB); sendSignal(ref, GSN_CM_REGREQ, signal, CmRegReq::SignalLength, JBB);
DEBUG_START(GSN_CM_REGREQ, nodeId, ""); DEBUG_START(GSN_CM_REGREQ, nodeId, "");
c_start.m_regReqReqSent++;
} }
/* /*
...@@ -518,6 +579,18 @@ Qmgr::sendCmRegReq(Signal * signal, Uint32 nodeId){ ...@@ -518,6 +579,18 @@ Qmgr::sendCmRegReq(Signal * signal, Uint32 nodeId){
/*******************************/ /*******************************/
/* CM_REGREQ */ /* CM_REGREQ */
/*******************************/ /*******************************/
static
int
check_start_type(Uint32 starting, Uint32 own)
{
if (starting == (1 << NodeState::ST_INITIAL_START) &&
((own & (1 << NodeState::ST_INITIAL_START)) == 0))
{
return 1;
}
return 0;
}
void Qmgr::execCM_REGREQ(Signal* signal) void Qmgr::execCM_REGREQ(Signal* signal)
{ {
DEBUG_START3(signal, ""); DEBUG_START3(signal, "");
...@@ -529,6 +602,17 @@ void Qmgr::execCM_REGREQ(Signal* signal) ...@@ -529,6 +602,17 @@ void Qmgr::execCM_REGREQ(Signal* signal)
const BlockReference Tblockref = cmRegReq->blockRef; const BlockReference Tblockref = cmRegReq->blockRef;
const Uint32 startingVersion = cmRegReq->version; const Uint32 startingVersion = cmRegReq->version;
addNodePtr.i = cmRegReq->nodeId; addNodePtr.i = cmRegReq->nodeId;
Uint32 gci = 1;
Uint32 start_type = ~0;
NdbNodeBitmask skip_nodes;
if (signal->getLength() == CmRegReq::SignalLength)
{
jam();
gci = cmRegReq->latest_gci;
start_type = cmRegReq->start_type;
skip_nodes.assign(NdbNodeBitmask::Size, cmRegReq->skip_nodes);
}
if (creadyDistCom == ZFALSE) { if (creadyDistCom == ZFALSE) {
jam(); jam();
...@@ -542,11 +626,19 @@ void Qmgr::execCM_REGREQ(Signal* signal) ...@@ -542,11 +626,19 @@ void Qmgr::execCM_REGREQ(Signal* signal)
return; return;
} }
ptrCheckGuard(addNodePtr, MAX_NDB_NODES, nodeRec); if (check_start_type(start_type, c_start.m_start_type))
{
jam();
sendCmRegrefLab(signal, Tblockref, CmRegRef::ZINCOMPATIBLE_START_TYPE);
return;
}
if (cpresident != getOwnNodeId()){ if (cpresident != getOwnNodeId())
{
jam(); jam();
if (cpresident == ZNIL) {
if (cpresident == ZNIL)
{
/*** /***
* We don't know the president. * We don't know the president.
* If the node to be added has lower node id * If the node to be added has lower node id
...@@ -554,13 +646,19 @@ void Qmgr::execCM_REGREQ(Signal* signal) ...@@ -554,13 +646,19 @@ void Qmgr::execCM_REGREQ(Signal* signal)
* candidate * candidate
*/ */
jam(); jam();
if (addNodePtr.i < cpresidentCandidate) { if (gci > c_start.m_president_candidate_gci ||
(gci == c_start.m_president_candidate_gci &&
addNodePtr.i < c_start.m_president_candidate))
{
jam(); jam();
cpresidentCandidate = addNodePtr.i; c_start.m_president_candidate = addNodePtr.i;
}//if c_start.m_president_candidate_gci = gci;
ndbout_c("assign candidate: %u %u", addNodePtr.i, gci);
}
sendCmRegrefLab(signal, Tblockref, CmRegRef::ZELECTION); sendCmRegrefLab(signal, Tblockref, CmRegRef::ZELECTION);
return; return;
} }
/** /**
* We are not the president. * We are not the president.
* We know the president. * We know the president.
...@@ -570,7 +668,8 @@ void Qmgr::execCM_REGREQ(Signal* signal) ...@@ -570,7 +668,8 @@ void Qmgr::execCM_REGREQ(Signal* signal)
return; return;
}//if }//if
if (c_start.m_startNode != 0){ if (c_start.m_startNode != 0)
{
jam(); jam();
/** /**
* President busy by adding another node * President busy by adding another node
...@@ -579,7 +678,8 @@ void Qmgr::execCM_REGREQ(Signal* signal) ...@@ -579,7 +678,8 @@ void Qmgr::execCM_REGREQ(Signal* signal)
return; return;
}//if }//if
if (ctoStatus == Q_ACTIVE) { if (ctoStatus == Q_ACTIVE)
{
jam(); jam();
/** /**
* Active taking over as president * Active taking over as president
...@@ -588,7 +688,8 @@ void Qmgr::execCM_REGREQ(Signal* signal) ...@@ -588,7 +688,8 @@ void Qmgr::execCM_REGREQ(Signal* signal)
return; return;
}//if }//if
if (getNodeInfo(addNodePtr.i).m_type != NodeInfo::DB) { if (getNodeInfo(addNodePtr.i).m_type != NodeInfo::DB)
{
jam(); jam();
/** /**
* The new node is not in config file * The new node is not in config file
...@@ -597,13 +698,15 @@ void Qmgr::execCM_REGREQ(Signal* signal) ...@@ -597,13 +698,15 @@ void Qmgr::execCM_REGREQ(Signal* signal)
return; return;
} }
ptrCheckGuard(addNodePtr, MAX_NDB_NODES, nodeRec);
Phase phase = addNodePtr.p->phase; Phase phase = addNodePtr.p->phase;
if (phase != ZINIT){ if (phase != ZINIT)
{
jam(); jam();
DEBUG("phase = " << phase); DEBUG("phase = " << phase);
sendCmRegrefLab(signal, Tblockref, CmRegRef::ZNOT_DEAD); sendCmRegrefLab(signal, Tblockref, CmRegRef::ZNOT_DEAD);
return; return;
}//if }
jam(); jam();
/** /**
...@@ -675,7 +778,12 @@ void Qmgr::sendCmRegrefLab(Signal* signal, BlockReference TBRef, ...@@ -675,7 +778,12 @@ void Qmgr::sendCmRegrefLab(Signal* signal, BlockReference TBRef,
ref->blockRef = reference(); ref->blockRef = reference();
ref->nodeId = getOwnNodeId(); ref->nodeId = getOwnNodeId();
ref->errorCode = Terror; ref->errorCode = Terror;
ref->presidentCandidate = (cpresident == ZNIL ? cpresidentCandidate : cpresident); ref->presidentCandidate =
(cpresident == ZNIL ? c_start.m_president_candidate : cpresident);
ref->candidate_latest_gci = c_start.m_president_candidate_gci;
ref->latest_gci = c_start.m_latest_gci;
ref->start_type = c_start.m_start_type;
c_start.m_skip_nodes.copyto(NdbNodeBitmask::Size, ref->skip_nodes);
sendSignal(TBRef, GSN_CM_REGREF, signal, sendSignal(TBRef, GSN_CM_REGREF, signal,
CmRegRef::SignalLength, JBB); CmRegRef::SignalLength, JBB);
DEBUG_START(GSN_CM_REGREF, refToNode(TBRef), ""); DEBUG_START(GSN_CM_REGREF, refToNode(TBRef), "");
...@@ -869,28 +977,105 @@ Qmgr::sendCmNodeInfoReq(Signal* signal, Uint32 nodeId, const NodeRec * self){ ...@@ -869,28 +977,105 @@ Qmgr::sendCmNodeInfoReq(Signal* signal, Uint32 nodeId, const NodeRec * self){
/*******************************/ /*******************************/
/* CM_REGREF */ /* CM_REGREF */
/*******************************/ /*******************************/
static
const char *
get_start_type_string(Uint32 st)
{
static char buf[256];
if (st == 0)
{
return "<ANY>";
}
else
{
buf[0] = 0;
for(Uint32 i = 0; i<NodeState::ST_ILLEGAL_TYPE; i++)
{
if (st & (1 << i))
{
if (buf[0])
strcat(buf, "/");
switch(i){
case NodeState::ST_INITIAL_START:
strcat(buf, "inital start");
break;
case NodeState::ST_SYSTEM_RESTART:
strcat(buf, "system restart");
break;
case NodeState::ST_NODE_RESTART:
strcat(buf, "node restart");
break;
case NodeState::ST_INITIAL_NODE_RESTART:
strcat(buf, "initial node restart");
break;
}
}
}
return buf;
}
}
void Qmgr::execCM_REGREF(Signal* signal) void Qmgr::execCM_REGREF(Signal* signal)
{ {
jamEntry(); jamEntry();
UintR TaddNodeno = signal->theData[1]; CmRegRef* ref = (CmRegRef*)signal->getDataPtr();
UintR TrefuseReason = signal->theData[2]; UintR TaddNodeno = ref->nodeId;
Uint32 candidate = signal->theData[3]; UintR TrefuseReason = ref->errorCode;
Uint32 candidate = ref->presidentCandidate;
Uint32 node_gci = 1;
Uint32 candidate_gci = 1;
Uint32 start_type = ~0;
NdbNodeBitmask skip_nodes;
DEBUG_START3(signal, TrefuseReason); DEBUG_START3(signal, TrefuseReason);
c_regReqReqRecv++; if (signal->getLength() == CmRegRef::SignalLength)
{
jam();
node_gci = ref->latest_gci;
candidate_gci = ref->candidate_latest_gci;
start_type = ref->start_type;
skip_nodes.assign(NdbNodeBitmask::Size, ref->skip_nodes);
}
c_start.m_regReqReqRecv++;
// Ignore block reference in data[0] // Ignore block reference in data[0]
if(candidate != cpresidentCandidate){ if(candidate != c_start.m_president_candidate)
{
jam(); jam();
c_regReqReqRecv = ~0; c_start.m_regReqReqRecv = ~0;
} }
c_start.m_starting_nodes.set(TaddNodeno);
if (node_gci)
{
jam();
c_start.m_starting_nodes_w_log.set(TaddNodeno);
}
skip_nodes.bitAND(c_definedNodes);
c_start.m_skip_nodes.bitOR(skip_nodes);
char buf[100];
switch (TrefuseReason) { switch (TrefuseReason) {
case CmRegRef::ZINCOMPATIBLE_VERSION: case CmRegRef::ZINCOMPATIBLE_VERSION:
jam(); jam();
systemErrorLab(signal, __LINE__, "incompatible version, connection refused by running ndb node"); systemErrorLab(signal, __LINE__,
"incompatible version, "
"connection refused by running ndb node");
case CmRegRef::ZINCOMPATIBLE_START_TYPE:
jam();
BaseString::snprintf(buf, sizeof(buf),
"incompatible start type detected: node %d"
" reports %s(%d) my start type: %s(%d)",
TaddNodeno,
get_start_type_string(start_type), start_type,
get_start_type_string(c_start.m_start_type),
c_start.m_start_type);
progError(__LINE__, NDBD_EXIT_SR_RESTARTCONFLICT, buf);
break; break;
case CmRegRef::ZBUSY: case CmRegRef::ZBUSY:
case CmRegRef::ZBUSY_TO_PRES: case CmRegRef::ZBUSY_TO_PRES:
...@@ -909,14 +1094,19 @@ void Qmgr::execCM_REGREF(Signal* signal) ...@@ -909,14 +1094,19 @@ void Qmgr::execCM_REGREF(Signal* signal)
break; break;
case CmRegRef::ZELECTION: case CmRegRef::ZELECTION:
jam(); jam();
if (cpresidentCandidate > TaddNodeno) { if (candidate_gci > c_start.m_president_candidate_gci ||
(candidate_gci == c_start.m_president_candidate_gci &&
candidate < c_start.m_president_candidate))
{
jam(); jam();
//---------------------------------------- //----------------------------------------
/* We may already have a candidate */ /* We may already have a candidate */
/* choose the lowest nodeno */ /* choose the lowest nodeno */
//---------------------------------------- //----------------------------------------
signal->theData[3] = 2; signal->theData[3] = 2;
cpresidentCandidate = TaddNodeno; c_start.m_president_candidate = candidate;
c_start.m_president_candidate_gci = candidate_gci;
ndbout_c("assign candidate: %u %u", candidate, candidate_gci);
} else { } else {
signal->theData[3] = 4; signal->theData[3] = 4;
}//if }//if
...@@ -944,32 +1134,34 @@ void Qmgr::execCM_REGREF(Signal* signal) ...@@ -944,32 +1134,34 @@ void Qmgr::execCM_REGREF(Signal* signal)
//----------------------------------------- //-----------------------------------------
sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 4, JBB); sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 4, JBB);
if(cpresidentAlive == ZTRUE){ if(cpresidentAlive == ZTRUE)
{
jam(); jam();
DEBUG(""); DEBUG("cpresidentAlive");
return; return;
} }
if(c_regReqReqSent != c_regReqReqRecv){ if(c_start.m_regReqReqSent != c_start.m_regReqReqRecv)
{
jam(); jam();
DEBUG( c_regReqReqSent << " != " << c_regReqReqRecv); DEBUG(c_start.m_regReqReqSent << " != " << c_start.m_regReqReqRecv);
return; return;
} }
if(cpresidentCandidate != getOwnNodeId()){ if(c_start.m_president_candidate != getOwnNodeId())
{
jam(); jam();
DEBUG(""); DEBUG("i'm not the candidate");
return; return;
} }
/** /**
* All configured nodes has agreed * All connected nodes has agreed
*/ */
Uint64 now = NdbTick_CurrentMillisecond(); if(check_startup(signal))
if((c_regReqReqRecv == cnoOfNodes) || now > c_stopElectionTime){ {
jam(); jam();
electionWon(signal); electionWon(signal);
sendSttorryLab(signal);
/** /**
* Start timer handling * Start timer handling
...@@ -981,6 +1173,190 @@ void Qmgr::execCM_REGREF(Signal* signal) ...@@ -981,6 +1173,190 @@ void Qmgr::execCM_REGREF(Signal* signal)
return; return;
}//Qmgr::execCM_REGREF() }//Qmgr::execCM_REGREF()
Uint32
Qmgr::check_startup(Signal* signal)
{
Uint64 now = NdbTick_CurrentMillisecond();
Uint64 partial_timeout = c_start_election_time + c_restartPartialTimeout;
Uint64 partitioned_timeout = partial_timeout + c_restartPartionedTimeout;
/**
* First see if we should wait more...
*/
NdbNodeBitmask tmp;
tmp.bitOR(c_start.m_skip_nodes);
tmp.bitOR(c_start.m_starting_nodes);
NdbNodeBitmask wait;
wait.assign(c_definedNodes);
wait.bitANDC(tmp);
Uint32 retVal = 0;
NdbNodeBitmask report_mask;
if ((c_start.m_latest_gci == 0) ||
(c_start.m_start_type == (1 << NodeState::ST_INITIAL_START)))
{
if (!tmp.equal(c_definedNodes))
{
jam();
signal->theData[1] = 1;
signal->theData[2] = ~0;
report_mask.assign(wait);
retVal = 0;
goto start_report;
}
else
{
jam();
signal->theData[1] = 0x8000;
report_mask.assign(c_definedNodes);
report_mask.bitANDC(c_start.m_starting_nodes);
retVal = 1;
goto start_report;
}
}
const bool all = c_start.m_starting_nodes.equal(c_definedNodes);
CheckNodeGroups* sd = (CheckNodeGroups*)&signal->theData[0];
{
/**
* Check for missing node group directly
*/
char buf[100];
NdbNodeBitmask check;
check.assign(c_definedNodes);
check.bitANDC(c_start.m_starting_nodes); // Not connected nodes
check.bitOR(c_start.m_starting_nodes_w_log);
sd->blockRef = reference();
sd->requestType = CheckNodeGroups::Direct | CheckNodeGroups::ArbitCheck;
sd->mask = check;
EXECUTE_DIRECT(DBDIH, GSN_CHECKNODEGROUPSREQ, signal,
CheckNodeGroups::SignalLength);
if (sd->output == CheckNodeGroups::Lose)
{
jam();
goto missing_nodegroup;
}
}
sd->blockRef = reference();
sd->requestType = CheckNodeGroups::Direct | CheckNodeGroups::ArbitCheck;
sd->mask = c_start.m_starting_nodes;
EXECUTE_DIRECT(DBDIH, GSN_CHECKNODEGROUPSREQ, signal,
CheckNodeGroups::SignalLength);
const Uint32 result = sd->output;
sd->blockRef = reference();
sd->requestType = CheckNodeGroups::Direct | CheckNodeGroups::ArbitCheck;
sd->mask = c_start.m_starting_nodes_w_log;
EXECUTE_DIRECT(DBDIH, GSN_CHECKNODEGROUPSREQ, signal,
CheckNodeGroups::SignalLength);
const Uint32 result_w_log = sd->output;
if (tmp.equal(c_definedNodes))
{
/**
* All nodes (wrt no-wait nodes) has connected...
* this means that we will now start or die
*/
jam();
switch(result_w_log){
case CheckNodeGroups::Lose:
{
jam();
goto missing_nodegroup;
}
case CheckNodeGroups::Win:
signal->theData[1] = all ? 0x8001 : 0x8002;
report_mask.assign(c_definedNodes);
report_mask.bitANDC(c_start.m_starting_nodes);
retVal = 1;
goto start_report;
case CheckNodeGroups::Partitioning:
ndbrequire(result != CheckNodeGroups::Lose);
signal->theData[1] =
all ? 0x8001 : (result == CheckNodeGroups::Win ? 0x8002 : 0x8003);
report_mask.assign(c_definedNodes);
report_mask.bitANDC(c_start.m_starting_nodes);
retVal = 1;
goto start_report;
}
}
if (now < partial_timeout)
{
jam();
signal->theData[1] = c_restartPartialTimeout == ~0 ? 2 : 3;
signal->theData[2] = Uint32((partial_timeout - now + 500) / 1000);
report_mask.assign(wait);
retVal = 0;
goto start_report;
}
/**
* Start partial has passed...check for partitioning...
*/
switch(result_w_log){
case CheckNodeGroups::Lose:
jam();
goto missing_nodegroup;
case CheckNodeGroups::Partitioning:
if (now < partitioned_timeout && result != CheckNodeGroups::Win)
{
signal->theData[1] = c_restartPartionedTimeout == ~0 ? 4 : 5;
signal->theData[2] = Uint32((partitioned_timeout - now + 500) / 1000);
report_mask.assign(c_definedNodes);
report_mask.bitANDC(c_start.m_starting_nodes);
retVal = 0;
goto start_report;
}
// Fall through...
case CheckNodeGroups::Win:
signal->theData[1] =
all ? 0x8001 : (result == CheckNodeGroups::Win ? 0x8002 : 0x8003);
report_mask.assign(c_definedNodes);
report_mask.bitANDC(c_start.m_starting_nodes);
retVal = 1;
goto start_report;
}
ndbrequire(false);
start_report:
jam();
{
Uint32 sz = NdbNodeBitmask::Size;
signal->theData[0] = NDB_LE_StartReport;
signal->theData[3] = sz;
Uint32* ptr = signal->theData+4;
c_definedNodes.copyto(sz, ptr); ptr += sz;
c_start.m_starting_nodes.copyto(sz, ptr); ptr += sz;
c_start.m_skip_nodes.copyto(sz, ptr); ptr += sz;
report_mask.copyto(sz, ptr); ptr+= sz;
sendSignal(CMVMI_REF, GSN_EVENT_REP, signal,
4+4*NdbNodeBitmask::Size, JBB);
}
return retVal;
missing_nodegroup:
jam();
char buf[100], mask1[100], mask2[100];
c_start.m_starting_nodes.getText(mask1);
tmp.assign(c_start.m_starting_nodes);
tmp.bitANDC(c_start.m_starting_nodes_w_log);
tmp.getText(mask2);
BaseString::snprintf(buf, sizeof(buf),
"Unable to start missing node group! "
" starting: %s (missing fs for: %s)",
mask1, mask2);
progError(__LINE__, NDBD_EXIT_SR_RESTARTCONFLICT, buf);
}
void void
Qmgr::electionWon(Signal* signal){ Qmgr::electionWon(Signal* signal){
NodeRecPtr myNodePtr; NodeRecPtr myNodePtr;
...@@ -999,7 +1375,7 @@ Qmgr::electionWon(Signal* signal){ ...@@ -999,7 +1375,7 @@ Qmgr::electionWon(Signal* signal){
c_clusterNodes.set(getOwnNodeId()); c_clusterNodes.set(getOwnNodeId());
cpresidentAlive = ZTRUE; cpresidentAlive = ZTRUE;
c_stopElectionTime = ~0; c_start_election_time = ~0;
c_start.reset(); c_start.reset();
signal->theData[0] = NDB_LE_CM_REGCONF; signal->theData[0] = NDB_LE_CM_REGCONF;
...@@ -1007,6 +1383,13 @@ Qmgr::electionWon(Signal* signal){ ...@@ -1007,6 +1383,13 @@ Qmgr::electionWon(Signal* signal){
signal->theData[2] = cpresident; signal->theData[2] = cpresident;
signal->theData[3] = 1; signal->theData[3] = 1;
sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 4, JBB); sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 4, JBB);
c_start.m_starting_nodes.clear(getOwnNodeId());
if (c_start.m_starting_nodes.isclear())
{
jam();
sendSttorryLab(signal);
}
} }
/* /*
...@@ -1020,7 +1403,15 @@ Qmgr::electionWon(Signal* signal){ ...@@ -1020,7 +1403,15 @@ Qmgr::electionWon(Signal* signal){
/*--------------------------------------------------------------*/ /*--------------------------------------------------------------*/
void Qmgr::regreqTimeLimitLab(Signal* signal) void Qmgr::regreqTimeLimitLab(Signal* signal)
{ {
if(cpresident == ZNIL){ if(cpresident == ZNIL)
{
if (c_start.m_president_candidate == ZNIL)
{
jam();
c_start.m_president_candidate = getOwnNodeId();
ndbout_c("Assigning candidate to self: %d", getOwnNodeId());
}
cmInfoconf010Lab(signal); cmInfoconf010Lab(signal);
} }
}//Qmgr::regreqTimelimitLab() }//Qmgr::regreqTimelimitLab()
...@@ -1430,6 +1821,17 @@ void Qmgr::execCM_ACKADD(Signal* signal) ...@@ -1430,6 +1821,17 @@ void Qmgr::execCM_ACKADD(Signal* signal)
*/ */
handleArbitNdbAdd(signal, addNodePtr.i); handleArbitNdbAdd(signal, addNodePtr.i);
c_start.reset(); c_start.reset();
if (c_start.m_starting_nodes.get(addNodePtr.i))
{
jam();
c_start.m_starting_nodes.clear(addNodePtr.i);
if (c_start.m_starting_nodes.isclear())
{
jam();
sendSttorryLab(signal);
}
}
return; return;
}//switch }//switch
ndbrequire(false); ndbrequire(false);
...@@ -1583,7 +1985,8 @@ void Qmgr::initData(Signal* signal) ...@@ -1583,7 +1985,8 @@ void Qmgr::initData(Signal* signal)
cnoPrepFailedNodes = 0; cnoPrepFailedNodes = 0;
creadyDistCom = ZFALSE; creadyDistCom = ZFALSE;
cpresident = ZNIL; cpresident = ZNIL;
cpresidentCandidate = ZNIL; c_start.m_president_candidate = ZNIL;
c_start.m_president_candidate_gci = 0;
cpdistref = 0; cpdistref = 0;
cneighbourh = ZNIL; cneighbourh = ZNIL;
cneighbourl = ZNIL; cneighbourl = ZNIL;
...@@ -1611,15 +2014,33 @@ void Qmgr::initData(Signal* signal) ...@@ -1611,15 +2014,33 @@ void Qmgr::initData(Signal* signal)
Uint32 hbDBAPI = 1500; Uint32 hbDBAPI = 1500;
Uint32 arbitTimeout = 1000; Uint32 arbitTimeout = 1000;
c_restartPartialTimeout = 30000; c_restartPartialTimeout = 30000;
c_restartPartionedTimeout = 60000;
c_restartFailureTimeout = ~0;
ndb_mgm_get_int_parameter(p, CFG_DB_HEARTBEAT_INTERVAL, &hbDBDB); ndb_mgm_get_int_parameter(p, CFG_DB_HEARTBEAT_INTERVAL, &hbDBDB);
ndb_mgm_get_int_parameter(p, CFG_DB_API_HEARTBEAT_INTERVAL, &hbDBAPI); ndb_mgm_get_int_parameter(p, CFG_DB_API_HEARTBEAT_INTERVAL, &hbDBAPI);
ndb_mgm_get_int_parameter(p, CFG_DB_ARBIT_TIMEOUT, &arbitTimeout); ndb_mgm_get_int_parameter(p, CFG_DB_ARBIT_TIMEOUT, &arbitTimeout);
ndb_mgm_get_int_parameter(p, CFG_DB_START_PARTIAL_TIMEOUT, ndb_mgm_get_int_parameter(p, CFG_DB_START_PARTIAL_TIMEOUT,
&c_restartPartialTimeout); &c_restartPartialTimeout);
if(c_restartPartialTimeout == 0){ ndb_mgm_get_int_parameter(p, CFG_DB_START_PARTITION_TIMEOUT,
&c_restartPartionedTimeout);
ndb_mgm_get_int_parameter(p, CFG_DB_START_FAILURE_TIMEOUT,
&c_restartFailureTimeout);
if(c_restartPartialTimeout == 0)
{
c_restartPartialTimeout = ~0; c_restartPartialTimeout = ~0;
} }
if (c_restartPartionedTimeout ==0)
{
c_restartPartionedTimeout = ~0;
}
if (c_restartFailureTimeout == 0)
{
c_restartFailureTimeout = ~0;
}
setHbDelay(hbDBDB); setHbDelay(hbDBDB);
setHbApiDelay(hbDBAPI); setHbApiDelay(hbDBAPI);
setArbitTimeout(arbitTimeout); setArbitTimeout(arbitTimeout);
...@@ -2051,6 +2472,16 @@ void Qmgr::execDISCONNECT_REP(Signal* signal) ...@@ -2051,6 +2472,16 @@ void Qmgr::execDISCONNECT_REP(Signal* signal)
NodeRecPtr nodePtr; NodeRecPtr nodePtr;
nodePtr.i = getOwnNodeId(); nodePtr.i = getOwnNodeId();
ptrCheckGuard(nodePtr, MAX_NODES, nodeRec); ptrCheckGuard(nodePtr, MAX_NODES, nodeRec);
char buf[100];
if (getNodeState().startLevel < NodeState::SL_STARTED)
{
jam();
BaseString::snprintf(buf, 100, "Node %u disconected", nodeId);
progError(__LINE__, NDBD_EXIT_SR_OTHERNODEFAILED, buf);
ndbrequire(false);
}
switch(nodePtr.p->phase){ switch(nodePtr.p->phase){
case ZRUNNING: case ZRUNNING:
jam(); jam();
...@@ -2069,7 +2500,6 @@ void Qmgr::execDISCONNECT_REP(Signal* signal) ...@@ -2069,7 +2500,6 @@ void Qmgr::execDISCONNECT_REP(Signal* signal)
ndbrequire(false); ndbrequire(false);
case ZAPI_INACTIVE: case ZAPI_INACTIVE:
{ {
char buf[100];
BaseString::snprintf(buf, 100, "Node %u disconected", nodeId); BaseString::snprintf(buf, 100, "Node %u disconected", nodeId);
progError(__LINE__, NDBD_EXIT_SR_OTHERNODEFAILED, buf); progError(__LINE__, NDBD_EXIT_SR_OTHERNODEFAILED, buf);
ndbrequire(false); ndbrequire(false);
...@@ -4178,8 +4608,10 @@ Qmgr::execDUMP_STATE_ORD(Signal* signal) ...@@ -4178,8 +4608,10 @@ Qmgr::execDUMP_STATE_ORD(Signal* signal)
case 1: case 1:
infoEvent("creadyDistCom = %d, cpresident = %d\n", infoEvent("creadyDistCom = %d, cpresident = %d\n",
creadyDistCom, cpresident); creadyDistCom, cpresident);
infoEvent("cpresidentAlive = %d, cpresidentCand = %d\n", infoEvent("cpresidentAlive = %d, cpresidentCand = %d (gci: %d)\n",
cpresidentAlive, cpresidentCandidate); cpresidentAlive,
c_start.m_president_candidate,
c_start.m_president_candidate_gci);
infoEvent("ctoStatus = %d\n", ctoStatus); infoEvent("ctoStatus = %d\n", ctoStatus);
for(Uint32 i = 1; i<MAX_NDB_NODES; i++){ for(Uint32 i = 1; i<MAX_NDB_NODES; i++){
if(getNodeInfo(i).getType() == NodeInfo::DB){ if(getNodeInfo(i).getType() == NodeInfo::DB){
......
ndb/src/kernel/vm/Configuration.cpp
View file @ 40d83bdf
...@@ -55,6 +55,12 @@ enum ndbd_options { ...@@ -55,6 +55,12 @@ enum ndbd_options {
NDB_STD_OPTS_VARS; NDB_STD_OPTS_VARS;
// XXX should be my_bool ??? // XXX should be my_bool ???
static int _daemon, _no_daemon, _foreground, _initial, _no_start; static int _daemon, _no_daemon, _foreground, _initial, _no_start;
static int _initialstart;
static const char* _nowait_nodes;
extern Uint32 g_start_type;
extern NdbNodeBitmask g_nowait_nodes;
/** /**
* Arguments to NDB process * Arguments to NDB process
*/ */
...@@ -82,6 +88,14 @@ static struct my_option my_long_options[] = ...@@ -82,6 +88,14 @@ static struct my_option my_long_options[] =
" (implies --nodaemon)", " (implies --nodaemon)",
(gptr*) &_foreground, (gptr*) &_foreground, 0, (gptr*) &_foreground, (gptr*) &_foreground, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ "nowait-nodes", NO_ARG,
"Nodes that will not be waited for during start",
(gptr*) &_nowait_nodes, (gptr*) &_nowait_nodes, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{ "initial-start", NO_ARG,
"Perform initial start",
(gptr*) &_initialstart, (gptr*) &_initialstart, 0,
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
}; };
static void short_usage_sub(void) static void short_usage_sub(void)
...@@ -150,6 +164,37 @@ Configuration::init(int argc, char** argv) ...@@ -150,6 +164,37 @@ Configuration::init(int argc, char** argv)
globalData.ownId= 0; globalData.ownId= 0;
if (_nowait_nodes)
{
BaseString str(_nowait_nodes);
Vector<BaseString> arr;
str.split(arr, ",");
for (Uint32 i = 0; i<arr.size(); i++)
{
char *endptr = 0;
long val = strtol(arr[i].c_str(), &endptr, 10);
if (*endptr)
{
ndbout_c("Unable to parse nowait-nodes argument: %s : %s",
arr[i].c_str(), _nowait_nodes);
exit(-1);
}
if (! (val > 0 && val < MAX_NDB_NODES))
{
ndbout_c("Invalid nodeid specified in nowait-nodes: %d : %s",
val, _nowait_nodes);
exit(-1);
}
g_nowait_nodes.set(val);
}
}
if (_initialstart)
{
_initialStart = true;
g_start_type |= (1 << NodeState::ST_INITIAL_START);
}
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7