Skip to content

M
mariadb
Commit 01f1d5e2 authored by unknown's avatar unknown
Browse files
Options

Bug fix for testBasic -n MassiveRollback, a bug in LCP in LQH 


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  max 4 replicas -> 3 next nodes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) If abort while in fragwaitqueue - just abort
  2) Fix for ACC_LCPSTARTED arrives after one ACC_LCPCONF has arrived
ndb/src/ndbapi/Ndbif.cpp:
  Be more "forgiving" in debug mode
ndb/test/ndbapi/testBasic.cpp:
  Accept timeouts in MassiveTimeout
ndb/test/src/HugoTransactions.cpp:
  Print batch size
parent cbc7e8c7
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 105 deletions
ndb/src/kernel/blocks/dblqh/Dblqh.hpp
View file @ 01f1d5e2
...@@ -410,7 +410,6 @@ ...@@ -410,7 +410,6 @@
*/ */
class Dblqh: public SimulatedBlock { class Dblqh: public SimulatedBlock {
public: public:
enum LcpCloseState { enum LcpCloseState {
LCP_IDLE = 0, LCP_IDLE = 0,
LCP_RUNNING = 1, // LCP is running LCP_RUNNING = 1, // LCP is running
...@@ -1990,7 +1989,6 @@ public: ...@@ -1990,7 +1989,6 @@ public:
UintR nextTcLogQueue; UintR nextTcLogQueue;
UintR nextTc; UintR nextTc;
UintR nextTcConnectrec; UintR nextTcConnectrec;
Uint16 nodeAfterNext[2];
UintR prevHashRec; UintR prevHashRec;
UintR prevLogTcrec; UintR prevLogTcrec;
UintR prevTc; UintR prevTc;
...@@ -2027,6 +2025,7 @@ public: ...@@ -2027,6 +2025,7 @@ public:
Uint16 nextReplica; Uint16 nextReplica;
Uint16 primKeyLen; Uint16 primKeyLen;
Uint16 save1; Uint16 save1;
Uint16 nodeAfterNext[3];
Uint8 activeCreat; Uint8 activeCreat;
Uint8 apiVersionNo; Uint8 apiVersionNo;
......
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file @ 01f1d5e2
...@@ -3574,7 +3574,6 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal) ...@@ -3574,7 +3574,6 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
key.scanNumber = KeyInfo20::getScanNo(regTcPtr->tcScanInfo); key.scanNumber = KeyInfo20::getScanNo(regTcPtr->tcScanInfo);
key.fragPtrI = fragptr.i; key.fragPtrI = fragptr.i;
c_scanTakeOverHash.find(scanptr, key); c_scanTakeOverHash.find(scanptr, key);
ndbassert(scanptr.i != RNIL);
} }
if (scanptr.i == RNIL) { if (scanptr.i == RNIL) {
jam(); jam();
...@@ -5995,10 +5994,15 @@ void Dblqh::abortStateHandlerLab(Signal* signal) ...@@ -5995,10 +5994,15 @@ void Dblqh::abortStateHandlerLab(Signal* signal)
break; break;
case TcConnectionrec::STOPPED: case TcConnectionrec::STOPPED:
jam(); jam();
/* ------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------
/*WE ARE CURRENTLY QUEUED FOR ACCESS TO THE FRAGMENT BY A LOCAL CHECKPOINT. */ * WE ARE CURRENTLY QUEUED FOR ACCESS TO THE FRAGMENT BY A LCP
/* ------------------------------------------------------------------------- */ * Since nothing has been done, just release operation
* i.e. no prepare log record has been written
* so no abort log records needs to be written
*/
releaseWaitQueue(signal); releaseWaitQueue(signal);
continueAfterLogAbortWriteLab(signal);
return;
break; break;
case TcConnectionrec::WAIT_AI_AFTER_ABORT: case TcConnectionrec::WAIT_AI_AFTER_ABORT:
jam(); jam();
...@@ -9953,9 +9957,11 @@ void Dblqh::execLCP_HOLDOPCONF(Signal* signal) ...@@ -9953,9 +9957,11 @@ void Dblqh::execLCP_HOLDOPCONF(Signal* signal)
return; return;
} else { } else {
jam(); jam();
/* NO MORE HOLDOPS NEEDED */ /* NO MORE HOLDOPS NEEDED */
lcpLocptr.p->lcpLocstate = LcpLocRecord::HOLDOP_READY; lcpLocptr.p->lcpLocstate = LcpLocRecord::HOLDOP_READY;
checkLcpHoldop(signal); checkLcpHoldop(signal);
if (lcpPtr.p->lcpState == LcpRecord::LCP_WAIT_ACTIVE_FINISH) { if (lcpPtr.p->lcpState == LcpRecord::LCP_WAIT_ACTIVE_FINISH) {
if (fragptr.p->activeList == RNIL) { if (fragptr.p->activeList == RNIL) {
jam(); jam();
...@@ -9973,6 +9979,7 @@ void Dblqh::execLCP_HOLDOPCONF(Signal* signal) ...@@ -9973,6 +9979,7 @@ void Dblqh::execLCP_HOLDOPCONF(Signal* signal)
}//if }//if
}//if }//if
}//if }//if
/* ----------------------- */ /* ----------------------- */
/* ELSE */ /* ELSE */
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
...@@ -10045,7 +10052,6 @@ void Dblqh::execTUP_LCPSTARTED(Signal* signal) ...@@ -10045,7 +10052,6 @@ void Dblqh::execTUP_LCPSTARTED(Signal* signal)
void Dblqh::lcpStartedLab(Signal* signal) void Dblqh::lcpStartedLab(Signal* signal)
{ {
checkLcpStarted(signal); checkLcpStarted(signal);
if (lcpPtr.p->lcpState == LcpRecord::LCP_STARTED) { if (lcpPtr.p->lcpState == LcpRecord::LCP_STARTED) {
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
...@@ -10064,7 +10070,7 @@ void Dblqh::lcpStartedLab(Signal* signal) ...@@ -10064,7 +10070,7 @@ void Dblqh::lcpStartedLab(Signal* signal)
sendAccContOp(signal); /* START OPERATIONS IN ACC */ sendAccContOp(signal); /* START OPERATIONS IN ACC */
moveAccActiveFrag(signal); /* MOVE FROM ACC BLOCKED LIST TO ACTIVE LIST moveAccActiveFrag(signal); /* MOVE FROM ACC BLOCKED LIST TO ACTIVE LIST
ON FRAGMENT */ ON FRAGMENT */
}//if }
/*---------------*/ /*---------------*/
/* ELSE */ /* ELSE */
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
...@@ -10125,32 +10131,27 @@ void Dblqh::execLQH_RESTART_OP(Signal* signal) ...@@ -10125,32 +10131,27 @@ void Dblqh::execLQH_RESTART_OP(Signal* signal)
lcpPtr.i = signal->theData[1]; lcpPtr.i = signal->theData[1];
ptrCheckGuard(lcpPtr, clcpFileSize, lcpRecord); ptrCheckGuard(lcpPtr, clcpFileSize, lcpRecord);
if (fragptr.p->fragStatus == Fragrecord::BLOCKED) { ndbrequire(fragptr.p->fragStatus == Fragrecord::BLOCKED);
if (lcpPtr.p->lcpState == LcpRecord::LCP_STARTED) { if (lcpPtr.p->lcpState == LcpRecord::LCP_STARTED) {
jam(); jam();
/***********************************************************************/ /***********************************************************************/
/* THIS SIGNAL CAN ONLY BE RECEIVED WHEN FRAGMENT IS BLOCKED AND /* THIS SIGNAL CAN ONLY BE RECEIVED WHEN FRAGMENT IS BLOCKED AND
* THE LOCAL CHECKPOINT HAS BEEN STARTED. THE BLOCKING WILL BE * THE LOCAL CHECKPOINT HAS BEEN STARTED. THE BLOCKING WILL BE
* REMOVED AS SOON AS ALL OPERATIONS HAVE BEEN STARTED. * REMOVED AS SOON AS ALL OPERATIONS HAVE BEEN STARTED.
***********************************************************************/ ***********************************************************************/
restartOperationsLab(signal); restartOperationsLab(signal);
return; } else if (lcpPtr.p->lcpState == LcpRecord::LCP_BLOCKED_COMP) {
} else { jam();
jam(); /*******************************************************************>
if (lcpPtr.p->lcpState == LcpRecord::LCP_BLOCKED_COMP) { * THE CHECKPOINT IS COMPLETED BUT HAS NOT YET STARTED UP
jam(); * ALL OPERATIONS AGAIN.
/*******************************************************************> * WE PERFORM THIS START-UP BEFORE CONTINUING WITH THE NEXT
* THE CHECKPOINT IS COMPLETED BUT HAS NOT YET STARTED UP * FRAGMENT OF THE LOCAL CHECKPOINT TO AVOID ANY STRANGE ERRORS.
* ALL OPERATIONS AGAIN. *******************************************************************> */
* WE PERFORM THIS START-UP BEFORE CONTINUING WITH THE NEXT restartOperationsLab(signal);
* FRAGMENT OF THE LOCAL CHECKPOINT TO AVOID ANY STRANGE ERRORS. } else {
*******************************************************************> */ ndbrequire(false);
restartOperationsLab(signal); }
return;
}//if
}//if
}//if
ndbrequire(false);
}//Dblqh::execLQH_RESTART_OP() }//Dblqh::execLQH_RESTART_OP()
void Dblqh::restartOperationsLab(Signal* signal) void Dblqh::restartOperationsLab(Signal* signal)
...@@ -10203,13 +10204,13 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10203,13 +10204,13 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
* WHEN ARRIVING HERE THE OPERATION IS ALREADY SET IN THE ACTIVE LIST. * WHEN ARRIVING HERE THE OPERATION IS ALREADY SET IN THE ACTIVE LIST.
* THUS WE CAN IMMEDIATELY CALL THE METHODS THAT EXECUTE FROM WHERE * THUS WE CAN IMMEDIATELY CALL THE METHODS THAT EXECUTE FROM WHERE
* THE OPERATION WAS STOPPED. * THE OPERATION WAS STOPPED.
*------------------------------------------------------------------------- */ *------------------------------------------------------------------------ */
switch (tcConnectptr.p->transactionState) { switch (tcConnectptr.p->transactionState) {
case TcConnectionrec::STOPPED: case TcConnectionrec::STOPPED:
jam(); jam();
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND ACCKEYREQ * STOPPED BEFORE TRYING TO SEND ACCKEYREQ
*----------------------------------------------------------------------- */ *---------------------------------------------------------------------- */
prepareContinueAfterBlockedLab(signal); prepareContinueAfterBlockedLab(signal);
return; return;
break; break;
...@@ -10217,7 +10218,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10217,7 +10218,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND ACC_COMMITREQ * STOPPED BEFORE TRYING TO SEND ACC_COMMITREQ
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
releaseActiveFrag(signal); releaseActiveFrag(signal);
commitContinueAfterBlockedLab(signal); commitContinueAfterBlockedLab(signal);
return; return;
...@@ -10226,7 +10227,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10226,7 +10227,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND ACC_ABORTREQ * STOPPED BEFORE TRYING TO SEND ACC_ABORTREQ
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
abortContinueAfterBlockedLab(signal, true); abortContinueAfterBlockedLab(signal, true);
return; return;
break; break;
...@@ -10234,7 +10235,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10234,7 +10235,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING COPY FRAGMENT * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING COPY FRAGMENT
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
continueCopyAfterBlockedLab(signal); continueCopyAfterBlockedLab(signal);
return; return;
break; break;
...@@ -10242,7 +10243,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10242,7 +10243,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING COPY FRAGMENT * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING COPY FRAGMENT
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
continueFirstCopyAfterBlockedLab(signal); continueFirstCopyAfterBlockedLab(signal);
return; return;
break; break;
...@@ -10250,7 +10251,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10250,7 +10251,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING SCAN * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING SCAN
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED; tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED;
continueFirstScanAfterBlockedLab(signal); continueFirstScanAfterBlockedLab(signal);
return; return;
...@@ -10259,7 +10260,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10259,7 +10260,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING SCAN * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING SCAN
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED; tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED;
continueAfterCheckLcpStopBlocked(signal); continueAfterCheckLcpStopBlocked(signal);
return; return;
...@@ -10268,7 +10269,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10268,7 +10269,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING SCAN * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING SCAN
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED; tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED;
continueScanAfterBlockedLab(signal); continueScanAfterBlockedLab(signal);
return; return;
...@@ -10278,7 +10279,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10278,7 +10279,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING RELEASE * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING RELEASE
* LOCKS IN SCAN * LOCKS IN SCAN
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED; tcConnectptr.p->transactionState = TcConnectionrec::SCAN_STATE_USED;
continueScanReleaseAfterBlockedLab(signal); continueScanReleaseAfterBlockedLab(signal);
return; return;
...@@ -10287,7 +10288,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10287,7 +10288,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING CLOSE OF SCAN * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING CLOSE OF SCAN
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
continueCloseScanAfterBlockedLab(signal); continueCloseScanAfterBlockedLab(signal);
return; return;
break; break;
...@@ -10295,7 +10296,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal) ...@@ -10295,7 +10296,7 @@ void Dblqh::restartOperationsAfterStopLab(Signal* signal)
jam(); jam();
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING CLOSE OF COPY * STOPPED BEFORE TRYING TO SEND NEXT_SCANREQ DURING CLOSE OF COPY
* ---------------------------------------------------------------------- */ * --------------------------------------------------------------------- */
continueCloseCopyAfterBlockedLab(signal); continueCloseCopyAfterBlockedLab(signal);
return; return;
break; break;
...@@ -10421,7 +10422,12 @@ void Dblqh::contChkpNextFragLab(Signal* signal) ...@@ -10421,7 +10422,12 @@ void Dblqh::contChkpNextFragLab(Signal* signal)
* ----------------------------------------------------------------------- */ * ----------------------------------------------------------------------- */
if (fragptr.p->fragStatus == Fragrecord::BLOCKED) { if (fragptr.p->fragStatus == Fragrecord::BLOCKED) {
jam(); jam();
/**
* LCP of fragment complete
* but restarting of operations isn't
*/
lcpPtr.p->lcpState = LcpRecord::LCP_BLOCKED_COMP; lcpPtr.p->lcpState = LcpRecord::LCP_BLOCKED_COMP;
//restartOperationsLab(signal);
return; return;
}//if }//if
...@@ -10698,25 +10704,25 @@ void Dblqh::checkLcpStarted(Signal* signal) ...@@ -10698,25 +10704,25 @@ void Dblqh::checkLcpStarted(Signal* signal)
terrorCode = ZOK; terrorCode = ZOK;
clsLcpLocptr.i = lcpPtr.p->firstLcpLocAcc; clsLcpLocptr.i = lcpPtr.p->firstLcpLocAcc;
int i = 0;
do { do {
ptrCheckGuard(clsLcpLocptr, clcpLocrecFileSize, lcpLocRecord); ptrCheckGuard(clsLcpLocptr, clcpLocrecFileSize, lcpLocRecord);
if (clsLcpLocptr.p->lcpLocstate != LcpLocRecord::ACC_STARTED) { if (clsLcpLocptr.p->lcpLocstate == LcpLocRecord::ACC_WAIT_STARTED){
ndbrequire((clsLcpLocptr.p->lcpLocstate == LcpLocRecord::ACC_COMPLETED) ||
(clsLcpLocptr.p->lcpLocstate == LcpLocRecord::ACC_WAIT_STARTED));
return; return;
}//if }//if
clsLcpLocptr.i = clsLcpLocptr.p->nextLcpLoc; clsLcpLocptr.i = clsLcpLocptr.p->nextLcpLoc;
i++;
} while (clsLcpLocptr.i != RNIL); } while (clsLcpLocptr.i != RNIL);
i = 0;
clsLcpLocptr.i = lcpPtr.p->firstLcpLocTup; clsLcpLocptr.i = lcpPtr.p->firstLcpLocTup;
do { do {
ptrCheckGuard(clsLcpLocptr, clcpLocrecFileSize, lcpLocRecord); ptrCheckGuard(clsLcpLocptr, clcpLocrecFileSize, lcpLocRecord);
if (clsLcpLocptr.p->lcpLocstate != LcpLocRecord::TUP_STARTED) { if (clsLcpLocptr.p->lcpLocstate == LcpLocRecord::TUP_WAIT_STARTED){
ndbrequire((clsLcpLocptr.p->lcpLocstate == LcpLocRecord::TUP_COMPLETED) ||
(clsLcpLocptr.p->lcpLocstate == LcpLocRecord::TUP_WAIT_STARTED));
return; return;
}//if }//if
clsLcpLocptr.i = clsLcpLocptr.p->nextLcpLoc; clsLcpLocptr.i = clsLcpLocptr.p->nextLcpLoc;
i++;
} while (clsLcpLocptr.i != RNIL); } while (clsLcpLocptr.i != RNIL);
lcpPtr.p->lcpState = LcpRecord::LCP_STARTED; lcpPtr.p->lcpState = LcpRecord::LCP_STARTED;
}//Dblqh::checkLcpStarted() }//Dblqh::checkLcpStarted()
...@@ -10874,18 +10880,28 @@ void Dblqh::sendAccContOp(Signal* signal) ...@@ -10874,18 +10880,28 @@ void Dblqh::sendAccContOp(Signal* signal)
{ {
LcpLocRecordPtr sacLcpLocptr; LcpLocRecordPtr sacLcpLocptr;
int count = 0;
sacLcpLocptr.i = lcpPtr.p->firstLcpLocAcc; sacLcpLocptr.i = lcpPtr.p->firstLcpLocAcc;
do { do {
ptrCheckGuard(sacLcpLocptr, clcpLocrecFileSize, lcpLocRecord); ptrCheckGuard(sacLcpLocptr, clcpLocrecFileSize, lcpLocRecord);
sacLcpLocptr.p->accContCounter = 0; sacLcpLocptr.p->accContCounter = 0;
/* ------------------------------------------------------------------------- */ if(sacLcpLocptr.p->lcpLocstate == LcpLocRecord::ACC_STARTED){
/*SEND START OPERATIONS TO ACC AGAIN */ /* ------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */ /*SEND START OPERATIONS TO ACC AGAIN */
signal->theData[0] = lcpPtr.p->lcpAccptr; /* ------------------------------------------------------------------- */
signal->theData[1] = sacLcpLocptr.p->locFragid; signal->theData[0] = lcpPtr.p->lcpAccptr;
sendSignal(fragptr.p->accBlockref, GSN_ACC_CONTOPREQ, signal, 2, JBA); signal->theData[1] = sacLcpLocptr.p->locFragid;
sendSignal(fragptr.p->accBlockref, GSN_ACC_CONTOPREQ, signal, 2, JBA);
count++;
} else if(sacLcpLocptr.p->lcpLocstate == LcpLocRecord::ACC_COMPLETED){
signal->theData[0] = sacLcpLocptr.i;
sendSignal(reference(), GSN_ACC_CONTOPCONF, signal, 1, JBB);
} else {
ndbrequire(false);
}
sacLcpLocptr.i = sacLcpLocptr.p->nextLcpLoc; sacLcpLocptr.i = sacLcpLocptr.p->nextLcpLoc;
} while (sacLcpLocptr.i != RNIL); } while (sacLcpLocptr.i != RNIL);
}//Dblqh::sendAccContOp() }//Dblqh::sendAccContOp()
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
......
ndb/src/ndbapi/Ndbif.cpp
View file @ 01f1d5e2
...@@ -350,47 +350,46 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) ...@@ -350,47 +350,46 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
return; return;
} }
case GSN_TRANSID_AI: case GSN_TRANSID_AI:{
{ tFirstDataPtr = int2void(tFirstData);
tFirstDataPtr = int2void(tFirstData); NdbReceiver* tRec;
assert(tFirstDataPtr); if (tFirstDataPtr && (tRec = void2rec(tFirstDataPtr)) &&
if (tFirstDataPtr == 0) goto InvalidSignal; tRec->checkMagicNumber() && (tCon = tRec->getTransaction()) &&
NdbReceiver* tRec = void2rec(tFirstDataPtr); tCon->checkState_TransId(((const TransIdAI*)tDataPtr)->transId)){
assert(tRec->checkMagicNumber()); Uint32 com;
assert(tRec->getTransaction()); if(aSignal->m_noOfSections > 0){
assert(tRec->getTransaction()->checkState_TransId(((const TransIdAI*)tDataPtr)->transId)); com = tRec->execTRANSID_AI(ptr[0].p, ptr[0].sz);
if(tRec->checkMagicNumber() && (tCon = tRec->getTransaction()) && } else {
tCon->checkState_TransId(((const TransIdAI*)tDataPtr)->transId)){ com = tRec->execTRANSID_AI(tDataPtr + TransIdAI::HeaderLength,
Uint32 com; tLen - TransIdAI::HeaderLength);
if(aSignal->m_noOfSections > 0){ }
com = tRec->execTRANSID_AI(ptr[0].p, ptr[0].sz);
} else { if(com == 1){
com = tRec->execTRANSID_AI(tDataPtr + TransIdAI::HeaderLength, switch(tRec->getType()){
tLen - TransIdAI::HeaderLength); case NdbReceiver::NDB_OPERATION:
} case NdbReceiver::NDB_INDEX_OPERATION:
if(tCon->OpCompleteSuccess() != -1){
if(com == 1){ completedTransaction(tCon);
switch(tRec->getType()){ return;
case NdbReceiver::NDB_OPERATION:
case NdbReceiver::NDB_INDEX_OPERATION:
if(tCon->OpCompleteSuccess() != -1){
completedTransaction(tCon);
return;
}
break;
case NdbReceiver::NDB_SCANRECEIVER:
tCon->theScanningOp->receiver_delivered(tRec);
theWaiter.m_state = (tWaitState == WAIT_SCAN? NO_WAIT: tWaitState);
break;
default:
goto InvalidSignal;
} }
break;
case NdbReceiver::NDB_SCANRECEIVER:
tCon->theScanningOp->receiver_delivered(tRec);
theWaiter.m_state = (tWaitState == WAIT_SCAN ? NO_WAIT : tWaitState);
break;
default:
goto InvalidSignal;
} }
break;
} else {
goto InvalidSignal;
} }
break;
} else {
/**
* This is ok as transaction can have been aborted before TRANSID_AI
* arrives (if TUP on other node than TC)
*/
return;
} }
}
case GSN_TCKEY_FAILCONF: case GSN_TCKEY_FAILCONF:
{ {
tFirstDataPtr = int2void(tFirstData); tFirstDataPtr = int2void(tFirstData);
...@@ -695,7 +694,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) ...@@ -695,7 +694,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
(tCon = void2con(tFirstDataPtr)) && (tCon->checkMagicNumber() == 0)){ (tCon = void2con(tFirstDataPtr)) && (tCon->checkMagicNumber() == 0)){
if(aSignal->m_noOfSections > 0){ if(aSignal->m_noOfSections > 0){
tReturnCode = tCon->receiveSCAN_TABCONF(aSignal, ptr[0].p, ptr[0].sz); tReturnCode = tCon->receiveSCAN_TABCONF(aSignal,
ptr[0].p, ptr[0].sz);
} else { } else {
tReturnCode = tReturnCode =
tCon->receiveSCAN_TABCONF(aSignal, tCon->receiveSCAN_TABCONF(aSignal,
...@@ -730,12 +730,11 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) ...@@ -730,12 +730,11 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
} }
case GSN_KEYINFO20: { case GSN_KEYINFO20: {
tFirstDataPtr = int2void(tFirstData); tFirstDataPtr = int2void(tFirstData);
if (tFirstDataPtr == 0) goto InvalidSignal; NdbReceiver* tRec;
NdbReceiver* tRec = void2rec(tFirstDataPtr); if (tFirstDataPtr && (tRec = void2rec(tFirstDataPtr)) &&
tRec->checkMagicNumber() && (tCon = tRec->getTransaction()) &&
if(tRec->checkMagicNumber() && (tCon = tRec->getTransaction()) && tCon->checkState_TransId(&((const KeyInfo20*)tDataPtr)->transId1)){
tCon->checkState_TransId(&((const KeyInfo20*)tDataPtr)->transId1)){
Uint32 len = ((const KeyInfo20*)tDataPtr)->keyLen; Uint32 len = ((const KeyInfo20*)tDataPtr)->keyLen;
Uint32 info = ((const KeyInfo20*)tDataPtr)->scanInfo_Node; Uint32 info = ((const KeyInfo20*)tDataPtr)->scanInfo_Node;
int com = -1; int com = -1;
...@@ -756,8 +755,13 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3]) ...@@ -756,8 +755,13 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
goto InvalidSignal; goto InvalidSignal;
} }
break; break;
} else {
/**
* This is ok as transaction can have been aborted before KEYINFO20
* arrives (if TUP on other node than TC)
*/
return;
} }
goto InvalidSignal;
} }
case GSN_TCINDXCONF:{ case GSN_TCINDXCONF:{
tFirstDataPtr = int2void(tFirstData); tFirstDataPtr = int2void(tFirstData);
......
ndb/test/ndbapi/testBasic.cpp
View file @ 01f1d5e2
...@@ -962,6 +962,7 @@ int runMassiveRollback(NDBT_Context* ctx, NDBT_Step* step){ ...@@ -962,6 +962,7 @@ int runMassiveRollback(NDBT_Context* ctx, NDBT_Step* step){
const Uint32 OPS_TOTAL = 4096; const Uint32 OPS_TOTAL = 4096;
for(int row = 0; row < records; row++){ for(int row = 0; row < records; row++){
int res;
CHECK(hugoOps.startTransaction(pNdb) == 0); CHECK(hugoOps.startTransaction(pNdb) == 0);
for(int i = 0; i<OPS_TOTAL; i += OPS_PER_TRANS){ for(int i = 0; i<OPS_TOTAL; i += OPS_PER_TRANS){
for(int j = 0; j<OPS_PER_TRANS; j++){ for(int j = 0; j<OPS_PER_TRANS; j++){
...@@ -972,7 +973,12 @@ int runMassiveRollback(NDBT_Context* ctx, NDBT_Step* step){ ...@@ -972,7 +973,12 @@ int runMassiveRollback(NDBT_Context* ctx, NDBT_Step* step){
if(result != NDBT_OK){ if(result != NDBT_OK){
break; break;
} }
CHECK(hugoOps.execute_NoCommit(pNdb) == 0); res = hugoOps.execute_NoCommit(pNdb);
if(res != 0){
NdbError err = pNdb->getNdbError(res);
CHECK(err.classification == NdbError::TimeoutExpired);
break;
}
} }
if(result != NDBT_OK){ if(result != NDBT_OK){
break; break;
......
ndb/test/src/HugoTransactions.cpp
View file @ 01f1d5e2
...@@ -1364,7 +1364,7 @@ HugoTransactions::pkUpdateRecords(Ndb* pNdb, ...@@ -1364,7 +1364,7 @@ HugoTransactions::pkUpdateRecords(Ndb* pNdb,
allocRows(batch); allocRows(batch);
g_info << "|- Updating records..." << endl; g_info << "|- Updating records (batch=" << batch << ")..." << endl;
while (r < records){ while (r < records){
if (retryAttempt >= retryMax){ if (retryAttempt >= retryMax){
......
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