Skip to content

M
MariaDB
Commit 70de99d0 authored by unknown's avatar unknown
Browse files
Options

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
parents 0381f8cf 51ef14cd
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 30 deletions
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
View file @ 70de99d0
...@@ -1840,9 +1840,14 @@ private: ...@@ -1840,9 +1840,14 @@ private:
Uint32 transid2); Uint32 transid2);
void removeMarkerForFailedAPI(Signal* signal, Uint32 nodeId, Uint32 bucket); void removeMarkerForFailedAPI(Signal* signal, Uint32 nodeId, Uint32 bucket);
bool getAllowStartTransaction() const { bool getAllowStartTransaction(Uint32 nodeId) const {
if(getNodeState().getSingleUserMode()) if (unlikely(getNodeState().getSingleUserMode()))
{
if (getNodeState().getSingleUserApi() == nodeId)
return true; return true;
else
return false;
}
return getNodeState().startLevel < NodeState::SL_STOPPING_2; return getNodeState().startLevel < NodeState::SL_STOPPING_2;
} }
......
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
View file @ 70de99d0
...@@ -1202,16 +1202,14 @@ void Dbtc::execTCSEIZEREQ(Signal* signal) ...@@ -1202,16 +1202,14 @@ void Dbtc::execTCSEIZEREQ(Signal* signal)
const NodeId senderNodeId = refToNode(tapiBlockref); const NodeId senderNodeId = refToNode(tapiBlockref);
const bool local = senderNodeId == getOwnNodeId() || senderNodeId == 0; const bool local = senderNodeId == getOwnNodeId() || senderNodeId == 0;
if(!(senderNodeId == getNodeState().getSingleUserApi()) && {
!getNodeState().getSingleUserMode()) { {
if(!(sl==NodeState::SL_SINGLEUSER &&
senderNodeId == getNodeState().getSingleUserApi())) {
if (!(sl == NodeState::SL_STARTED || if (!(sl == NodeState::SL_STARTED ||
(sl == NodeState::SL_STARTING && local == true))) { (sl == NodeState::SL_STARTING && local == true))) {
jam(); jam();
Uint32 errCode; Uint32 errCode = 0;
if(!(sl == NodeState::SL_SINGLEUSER && local)) if(!local)
{ {
switch(sl){ switch(sl){
case NodeState::SL_STARTING: case NodeState::SL_STARTING:
...@@ -1219,6 +1217,9 @@ void Dbtc::execTCSEIZEREQ(Signal* signal) ...@@ -1219,6 +1217,9 @@ void Dbtc::execTCSEIZEREQ(Signal* signal)
break; break;
case NodeState::SL_STOPPING_1: case NodeState::SL_STOPPING_1:
case NodeState::SL_STOPPING_2: case NodeState::SL_STOPPING_2:
if (getNodeState().getSingleUserMode() &&
getNodeState().getSingleUserApi() == senderNodeId)
break;
case NodeState::SL_STOPPING_3: case NodeState::SL_STOPPING_3:
case NodeState::SL_STOPPING_4: case NodeState::SL_STOPPING_4:
if(getNodeState().stopping.systemShutdown) if(getNodeState().stopping.systemShutdown)
...@@ -1227,16 +1228,21 @@ void Dbtc::execTCSEIZEREQ(Signal* signal) ...@@ -1227,16 +1228,21 @@ void Dbtc::execTCSEIZEREQ(Signal* signal)
errCode = ZNODE_SHUTDOWN_IN_PROGRESS; errCode = ZNODE_SHUTDOWN_IN_PROGRESS;
break; break;
case NodeState::SL_SINGLEUSER: case NodeState::SL_SINGLEUSER:
if (getNodeState().getSingleUserApi() == senderNodeId)
break;
errCode = ZCLUSTER_IN_SINGLEUSER_MODE; errCode = ZCLUSTER_IN_SINGLEUSER_MODE;
break; break;
default: default:
errCode = ZWRONG_STATE; errCode = ZWRONG_STATE;
break; break;
} }
if (errCode)
{
signal->theData[0] = tapiPointer; signal->theData[0] = tapiPointer;
signal->theData[1] = errCode; signal->theData[1] = errCode;
sendSignal(tapiBlockref, GSN_TCSEIZEREF, signal, 2, JBB); sendSignal(tapiBlockref, GSN_TCSEIZEREF, signal, 2, JBB);
return; return;
}
}//if (!(sl == SL_SINGLEUSER)) }//if (!(sl == SL_SINGLEUSER))
} //if } //if
} }
...@@ -1724,8 +1730,14 @@ Dbtc::TCKEY_abort(Signal* signal, int place) ...@@ -1724,8 +1730,14 @@ Dbtc::TCKEY_abort(Signal* signal, int place)
* Initialize object before starting error handling * Initialize object before starting error handling
*/ */
initApiConnectRec(signal, apiConnectptr.p, true); initApiConnectRec(signal, apiConnectptr.p, true);
start_failure:
switch(getNodeState().startLevel){ switch(getNodeState().startLevel){
case NodeState::SL_STOPPING_2: case NodeState::SL_STOPPING_2:
if (getNodeState().getSingleUserMode())
{
terrorCode = ZCLUSTER_IN_SINGLEUSER_MODE;
break;
}
case NodeState::SL_STOPPING_3: case NodeState::SL_STOPPING_3:
case NodeState::SL_STOPPING_4: case NodeState::SL_STOPPING_4:
if(getNodeState().stopping.systemShutdown) if(getNodeState().stopping.systemShutdown)
...@@ -1736,6 +1748,12 @@ Dbtc::TCKEY_abort(Signal* signal, int place) ...@@ -1736,6 +1748,12 @@ Dbtc::TCKEY_abort(Signal* signal, int place)
case NodeState::SL_SINGLEUSER: case NodeState::SL_SINGLEUSER:
terrorCode = ZCLUSTER_IN_SINGLEUSER_MODE; terrorCode = ZCLUSTER_IN_SINGLEUSER_MODE;
break; break;
case NodeState::SL_STOPPING_1:
if (getNodeState().getSingleUserMode())
{
terrorCode = ZCLUSTER_IN_SINGLEUSER_MODE;
break;
}
default: default:
terrorCode = ZWRONG_STATE; terrorCode = ZWRONG_STATE;
break; break;
...@@ -1757,6 +1775,13 @@ Dbtc::TCKEY_abort(Signal* signal, int place) ...@@ -1757,6 +1775,13 @@ Dbtc::TCKEY_abort(Signal* signal, int place)
return; return;
} }
case 60:
{
jam();
initApiConnectRec(signal, apiConnectptr.p, true);
apiConnectptr.p->m_exec_flag = 1;
goto start_failure;
}
default: default:
jam(); jam();
systemErrorLab(signal, __LINE__); systemErrorLab(signal, __LINE__);
...@@ -2486,6 +2511,7 @@ Dbtc::seizeCacheRecord(Signal* signal) ...@@ -2486,6 +2511,7 @@ Dbtc::seizeCacheRecord(Signal* signal)
/*****************************************************************************/ /*****************************************************************************/
void Dbtc::execTCKEYREQ(Signal* signal) void Dbtc::execTCKEYREQ(Signal* signal)
{ {
Uint32 sendersNodeId = refToNode(signal->getSendersBlockRef());
UintR compare_transid1, compare_transid2; UintR compare_transid1, compare_transid2;
UintR titcLenAiInTckeyreq; UintR titcLenAiInTckeyreq;
UintR TkeyLength; UintR TkeyLength;
...@@ -2531,7 +2557,7 @@ void Dbtc::execTCKEYREQ(Signal* signal) ...@@ -2531,7 +2557,7 @@ void Dbtc::execTCKEYREQ(Signal* signal)
regApiPtr->m_exec_flag |= TexecFlag; regApiPtr->m_exec_flag |= TexecFlag;
switch (regApiPtr->apiConnectstate) { switch (regApiPtr->apiConnectstate) {
case CS_CONNECTED:{ case CS_CONNECTED:{
if (TstartFlag == 1 && getAllowStartTransaction() == true){ if (TstartFlag == 1 && getAllowStartTransaction(sendersNodeId) == true){
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// Initialise API connect record if transaction is started. // Initialise API connect record if transaction is started.
//--------------------------------------------------------------------- //---------------------------------------------------------------------
...@@ -2539,7 +2565,7 @@ void Dbtc::execTCKEYREQ(Signal* signal) ...@@ -2539,7 +2565,7 @@ void Dbtc::execTCKEYREQ(Signal* signal)
initApiConnectRec(signal, regApiPtr); initApiConnectRec(signal, regApiPtr);
regApiPtr->m_exec_flag = TexecFlag; regApiPtr->m_exec_flag = TexecFlag;
} else { } else {
if(getAllowStartTransaction() == true){ if(getAllowStartTransaction(sendersNodeId) == true){
/*------------------------------------------------------------------ /*------------------------------------------------------------------
* WE EXPECTED A START TRANSACTION. SINCE NO OPERATIONS HAVE BEEN * WE EXPECTED A START TRANSACTION. SINCE NO OPERATIONS HAVE BEEN
* RECEIVED WE INDICATE THIS BY SETTING FIRST_TC_CONNECT TO RNIL TO * RECEIVED WE INDICATE THIS BY SETTING FIRST_TC_CONNECT TO RNIL TO
...@@ -2549,9 +2575,9 @@ void Dbtc::execTCKEYREQ(Signal* signal) ...@@ -2549,9 +2575,9 @@ void Dbtc::execTCKEYREQ(Signal* signal)
return; return;
} else { } else {
/** /**
* getAllowStartTransaction() == false * getAllowStartTransaction(sendersNodeId) == false
*/ */
TCKEY_abort(signal, 57); TCKEY_abort(signal, TexecFlag ? 60 : 57);
return; return;
}//if }//if
} }
...@@ -6154,9 +6180,11 @@ and otherwise we spread it out 310 ms. ...@@ -6154,9 +6180,11 @@ and otherwise we spread it out 310 ms.
void Dbtc::timeOutLoopStartLab(Signal* signal, Uint32 api_con_ptr) void Dbtc::timeOutLoopStartLab(Signal* signal, Uint32 api_con_ptr)
{ {
Uint32 end_ptr, time_passed, time_out_value, mask_value; Uint32 end_ptr, time_passed, time_out_value, mask_value;
Uint32 old_mask_value= 0;
const Uint32 api_con_sz= capiConnectFilesize; const Uint32 api_con_sz= capiConnectFilesize;
const Uint32 tc_timer= ctcTimer; const Uint32 tc_timer= ctcTimer;
const Uint32 time_out_param= ctimeOutValue; const Uint32 time_out_param= ctimeOutValue;
const Uint32 old_time_out_param= c_abortRec.oldTimeOutValue;
ctimeOutCheckHeartbeat = tc_timer; ctimeOutCheckHeartbeat = tc_timer;
...@@ -6177,11 +6205,39 @@ void Dbtc::timeOutLoopStartLab(Signal* signal, Uint32 api_con_ptr) ...@@ -6177,11 +6205,39 @@ void Dbtc::timeOutLoopStartLab(Signal* signal, Uint32 api_con_ptr)
jam(); jam();
mask_value= 31; mask_value= 31;
} }
if (time_out_param != old_time_out_param &&
getNodeState().getSingleUserMode())
{
// abort during single user mode, use old_mask_value as flag
// and calculate value to be used for connections with allowed api
if (old_time_out_param > 300) {
jam();
old_mask_value= 63;
} else if (old_time_out_param < 30) {
jam();
old_mask_value= 7;
} else {
jam();
old_mask_value= 31;
}
}
for ( ; api_con_ptr < end_ptr; api_con_ptr++) { for ( ; api_con_ptr < end_ptr; api_con_ptr++) {
Uint32 api_timer= getApiConTimer(api_con_ptr); Uint32 api_timer= getApiConTimer(api_con_ptr);
jam(); jam();
if (api_timer != 0) { if (api_timer != 0) {
time_out_value= time_out_param + (api_con_ptr & mask_value); time_out_value= time_out_param + (api_con_ptr & mask_value);
if (unlikely(old_mask_value)) // abort during single user mode
{
apiConnectptr.i = api_con_ptr;
ptrCheckGuard(apiConnectptr, capiConnectFilesize, apiConnectRecord);
if (getNodeState().getSingleUserApi() ==
refToNode(apiConnectptr.p->ndbapiBlockref))
{
// api allowed during single user, use original timeout
time_out_value=
old_time_out_param + (api_con_ptr & old_mask_value);
}
}
time_passed= tc_timer - api_timer; time_passed= tc_timer - api_timer;
if (time_passed > time_out_value) if (time_passed > time_out_value)
{ {
...@@ -6798,6 +6854,33 @@ void Dbtc::timeOutFoundFragLab(Signal* signal, UintR TscanConPtr) ...@@ -6798,6 +6854,33 @@ void Dbtc::timeOutFoundFragLab(Signal* signal, UintR TscanConPtr)
c_scan_frag_pool.getPtr(ptr, TscanConPtr); c_scan_frag_pool.getPtr(ptr, TscanConPtr);
DEBUG(TscanConPtr << " timeOutFoundFragLab: scanFragState = "<< ptr.p->scanFragState); DEBUG(TscanConPtr << " timeOutFoundFragLab: scanFragState = "<< ptr.p->scanFragState);
const Uint32 time_out_param= ctimeOutValue;
const Uint32 old_time_out_param= c_abortRec.oldTimeOutValue;
if (unlikely(time_out_param != old_time_out_param &&
getNodeState().getSingleUserMode()))
{
jam();
ScanRecordPtr scanptr;
scanptr.i = ptr.p->scanRec;
ptrCheckGuard(scanptr, cscanrecFileSize, scanRecord);
ApiConnectRecordPtr TlocalApiConnectptr;
TlocalApiConnectptr.i = scanptr.p->scanApiRec;
ptrCheckGuard(TlocalApiConnectptr, capiConnectFilesize, apiConnectRecord);
if (refToNode(TlocalApiConnectptr.p->ndbapiBlockref) ==
getNodeState().getSingleUserApi())
{
jam();
Uint32 val = ctcTimer - ptr.p->scanFragTimer;
if (val <= old_time_out_param)
{
jam();
goto next;
}
}
}
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
// The scan fragment has expired its timeout. Check its state to decide // The scan fragment has expired its timeout. Check its state to decide
// what to do. // what to do.
...@@ -6859,6 +6942,7 @@ void Dbtc::timeOutFoundFragLab(Signal* signal, UintR TscanConPtr) ...@@ -6859,6 +6942,7 @@ void Dbtc::timeOutFoundFragLab(Signal* signal, UintR TscanConPtr)
break; break;
}//switch }//switch
next:
signal->theData[0] = TcContinueB::ZCONTINUE_TIME_OUT_FRAG_CONTROL; signal->theData[0] = TcContinueB::ZCONTINUE_TIME_OUT_FRAG_CONTROL;
signal->theData[1] = TscanConPtr + 1; signal->theData[1] = TscanConPtr + 1;
sendSignal(cownref, GSN_CONTINUEB, signal, 2, JBB); sendSignal(cownref, GSN_CONTINUEB, signal, 2, JBB);
...@@ -8693,6 +8777,14 @@ void Dbtc::execSCAN_TABREQ(Signal* signal) ...@@ -8693,6 +8777,14 @@ void Dbtc::execSCAN_TABREQ(Signal* signal)
} }
} }
if (getNodeState().startLevel == NodeState::SL_SINGLEUSER &&
getNodeState().getSingleUserApi() !=
refToNode(apiConnectptr.p->ndbapiBlockref))
{
errCode = ZCLUSTER_IN_SINGLEUSER_MODE;
goto SCAN_TAB_error;
}
seizeTcConnect(signal); seizeTcConnect(signal);
tcConnectptr.p->apiConnect = apiConnectptr.i; tcConnectptr.p->apiConnect = apiConnectptr.i;
tcConnectptr.p->tcConnectstate = OS_WAIT_SCAN; tcConnectptr.p->tcConnectstate = OS_WAIT_SCAN;
...@@ -11012,7 +11104,7 @@ void Dbtc::execABORT_ALL_REQ(Signal* signal) ...@@ -11012,7 +11104,7 @@ void Dbtc::execABORT_ALL_REQ(Signal* signal)
const Uint32 senderData = req->senderData; const Uint32 senderData = req->senderData;
const BlockReference senderRef = req->senderRef; const BlockReference senderRef = req->senderRef;
if(getAllowStartTransaction() == true && !getNodeState().getSingleUserMode()){ if(getAllowStartTransaction(refToNode(senderRef)) == true && !getNodeState().getSingleUserMode()){
jam(); jam();
ref->senderData = senderData; ref->senderData = senderData;
...@@ -11440,6 +11532,17 @@ void Dbtc::execTCINDXREQ(Signal* signal) ...@@ -11440,6 +11532,17 @@ void Dbtc::execTCINDXREQ(Signal* signal)
regApiPtr->transid[1] = tcIndxReq->transId2; regApiPtr->transid[1] = tcIndxReq->transId2;
}//if }//if
if (getNodeState().startLevel == NodeState::SL_SINGLEUSER &&
getNodeState().getSingleUserApi() !=
refToNode(regApiPtr->ndbapiBlockref))
{
terrorCode = ZCLUSTER_IN_SINGLEUSER_MODE;
regApiPtr->m_exec_flag |= TcKeyReq::getExecuteFlag(tcIndxRequestInfo);
apiConnectptr = transPtr;
abortErrorLab(signal);
return;
}
if (ERROR_INSERTED(8036) || !seizeIndexOperation(regApiPtr, indexOpPtr)) { if (ERROR_INSERTED(8036) || !seizeIndexOperation(regApiPtr, indexOpPtr)) {
jam(); jam();
// Failed to allocate index operation // Failed to allocate index operation
......
storage/ndb/src/ndbapi/ClusterMgr.cpp
View file @ 70de99d0
...@@ -389,7 +389,7 @@ ClusterMgr::execAPI_REGCONF(const Uint32 * theData){ ...@@ -389,7 +389,7 @@ ClusterMgr::execAPI_REGCONF(const Uint32 * theData){
node.m_state = apiRegConf->nodeState; node.m_state = apiRegConf->nodeState;
if (node.compatible && (node.m_state.startLevel == NodeState::SL_STARTED || if (node.compatible && (node.m_state.startLevel == NodeState::SL_STARTED ||
node.m_state.startLevel == NodeState::SL_SINGLEUSER)){ node.m_state.getSingleUserMode())){
set_node_alive(node, true); set_node_alive(node, true);
} else { } else {
set_node_alive(node, false); set_node_alive(node, false);
......
storage/ndb/src/ndbapi/Ndb.cpp
View file @ 70de99d0
...@@ -58,6 +58,8 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode) ...@@ -58,6 +58,8 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
// We have connections now to the desired node. Return // We have connections now to the desired node. Return
//**************************************************************************** //****************************************************************************
DBUG_RETURN(getConnectedNdbTransaction(tConNode)); DBUG_RETURN(getConnectedNdbTransaction(tConNode));
} else if (TretCode < 0) {
DBUG_RETURN(NULL);
} else if (TretCode != 0) { } else if (TretCode != 0) {
tAnyAlive = 1; tAnyAlive = 1;
}//if }//if
...@@ -81,6 +83,8 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode) ...@@ -81,6 +83,8 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
// We have connections now to the desired node. Return // We have connections now to the desired node. Return
//**************************************************************************** //****************************************************************************
DBUG_RETURN(getConnectedNdbTransaction(tNode)); DBUG_RETURN(getConnectedNdbTransaction(tNode));
} else if (TretCode < 0) {
DBUG_RETURN(NULL);
} else if (TretCode != 0) { } else if (TretCode != 0) {
tAnyAlive= 1; tAnyAlive= 1;
}//if }//if
...@@ -109,6 +113,8 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode) ...@@ -109,6 +113,8 @@ NdbTransaction* Ndb::doConnect(Uint32 tConNode)
// We have connections now to the desired node. Return // We have connections now to the desired node. Return
//**************************************************************************** //****************************************************************************
DBUG_RETURN(getConnectedNdbTransaction(tNode)); DBUG_RETURN(getConnectedNdbTransaction(tNode));
} else if (TretCode < 0) {
DBUG_RETURN(NULL);
} else if (TretCode != 0) { } else if (TretCode != 0) {
tAnyAlive= 1; tAnyAlive= 1;
}//if }//if
...@@ -195,6 +201,11 @@ Ndb::NDB_connect(Uint32 tNode) ...@@ -195,6 +201,11 @@ Ndb::NDB_connect(Uint32 tNode)
DBUG_PRINT("info", DBUG_PRINT("info",
("unsuccessful connect tReturnCode %d, tNdbCon->Status() %d", ("unsuccessful connect tReturnCode %d, tNdbCon->Status() %d",
tReturnCode, tNdbCon->Status())); tReturnCode, tNdbCon->Status()));
if (theError.code == 299)
{
// single user mode so no need to retry with other node
DBUG_RETURN(-1);
}
DBUG_RETURN(3); DBUG_RETURN(3);
}//if }//if
}//Ndb::NDB_connect() }//Ndb::NDB_connect()
......
storage/ndb/src/ndbapi/TransporterFacade.hpp
View file @ 70de99d0
...@@ -365,7 +365,8 @@ inline ...@@ -365,7 +365,8 @@ inline
bool bool
TransporterFacade::get_node_stopping(NodeId n) const { TransporterFacade::get_node_stopping(NodeId n) const {
const ClusterMgr::Node & node = theClusterMgr->getNodeInfo(n); const ClusterMgr::Node & node = theClusterMgr->getNodeInfo(n);
return ((node.m_state.startLevel == NodeState::SL_STOPPING_1) || return (!node.m_state.getSingleUserMode() &&
(node.m_state.startLevel == NodeState::SL_STOPPING_1) ||
(node.m_state.startLevel == NodeState::SL_STOPPING_2)); (node.m_state.startLevel == NodeState::SL_STOPPING_2));
} }
...@@ -376,16 +377,9 @@ TransporterFacade::getIsNodeSendable(NodeId n) const { ...@@ -376,16 +377,9 @@ TransporterFacade::getIsNodeSendable(NodeId n) const {
const Uint32 startLevel = node.m_state.startLevel; const Uint32 startLevel = node.m_state.startLevel;
if (node.m_info.m_type == NodeInfo::DB) { if (node.m_info.m_type == NodeInfo::DB) {
if(node.m_state.singleUserMode &&
ownId() == node.m_state.singleUserApi) {
return (node.compatible &&
(node.m_state.startLevel == NodeState::SL_STOPPING_1 ||
node.m_state.startLevel == NodeState::SL_STARTED ||
node.m_state.startLevel == NodeState::SL_SINGLEUSER));
}
else
return node.compatible && (startLevel == NodeState::SL_STARTED || return node.compatible && (startLevel == NodeState::SL_STARTED ||
startLevel == NodeState::SL_STOPPING_1); startLevel == NodeState::SL_STOPPING_1 ||
node.m_state.getSingleUserMode());
} else { } else {
ndbout_c("TransporterFacade::getIsNodeSendable: Illegal node type: " ndbout_c("TransporterFacade::getIsNodeSendable: Illegal node type: "
"%d of node: %d", "%d of node: %d",
......
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