Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb (fcb13e45) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/include/kernel/signaldata/DumpStateOrd.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ public:
		// 100-105 TUP and ACC
		// 200-240 UTIL
		// 300-305 TRIX
		QmgrErr935 = 935,
		NdbfsDumpFileStat = 400,
		NdbfsDumpAllFiles = 401,
		NdbfsDumpOpenFiles = 402,

ndb/src/kernel/blocks/ERROR_codes.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@ Crash president when he starts to run in ArbitState 1-9.

		910: Crash new president after node crash

		935 : Crash master on node failure (delayed)
		and skip sending GSN_COMMIT_FAILREQ to specified node

		ERROR CODES FOR TESTING NODE FAILURE, GLOBAL CHECKPOINT HANDLING:
		-----------------------------------------------------------------

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -3554,7 +3554,6 @@ void Dbdih::endTakeOver(Uint32 takeOverPtrI)
		takeOverPtr.i = takeOverPtrI;
		ptrCheckGuard(takeOverPtr, MAX_NDB_NODES, takeOverRecord);

		releaseTakeOver(takeOverPtrI);
		if ((takeOverPtr.p->toMasterStatus != TakeOverRecord::IDLE) &&
		(takeOverPtr.p->toMasterStatus != TakeOverRecord::TO_WAIT_START_TAKE_OVER)) {
		jam();
		@@ -3568,6 +3567,7 @@ void Dbdih::endTakeOver(Uint32 takeOverPtrI)
		}//if
		setAllowNodeStart(takeOverPtr.p->toStartingNode, true);
		initTakeOver(takeOverPtr);
		releaseTakeOver(takeOverPtrI);
		}//Dbdih::endTakeOver()

		void Dbdih::releaseTakeOver(Uint32 takeOverPtrI)
		@@ -4709,6 +4709,7 @@ void Dbdih::handleTakeOverNewMaster(Signal* signal, Uint32 takeOverPtrI)
		break;
		}
		ndbrequire(ok);
		endTakeOver(takeOverPtr.i);
		}//if
		}//Dbdih::handleTakeOverNewMaster()

ndb/src/kernel/blocks/qmgr/Qmgr.hpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -425,6 +425,10 @@ private:

		StopReq c_stopReq;
		bool check_multi_node_shutdown(Signal* signal);

		#ifdef ERROR_INSERT
		Uint32 c_error_insert_extra;
		#endif
		};

		#endif

ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

+80 −13

Original line number	Diff line number	Diff line
		@@ -2894,6 +2894,17 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode,
		systemErrorLab(signal, __LINE__);
		return;
		}//if

		if (getNodeState().startLevel < NodeState::SL_STARTED)
		{
		jam();
		CRASH_INSERTION(932);
		char buf[100];
		BaseString::snprintf(buf, 100, "Node failure during restart");
		progError(__LINE__, NDBD_EXIT_SR_OTHERNODEFAILED, buf);
		ndbrequire(false);
		}

		TnoFailedNodes = cnoFailedNodes;
		failReport(signal, failedNodePtr.i, (UintR)ZTRUE, aFailCause);
		if (cpresident == getOwnNodeId()) {
		@@ -2980,6 +2991,16 @@ void Qmgr::execPREP_FAILREQ(Signal* signal)
		return;
		}//if

		if (getNodeState().startLevel < NodeState::SL_STARTED)
		{
		jam();
		CRASH_INSERTION(932);
		char buf[100];
		BaseString::snprintf(buf, 100, "Node failure during restart");
		progError(__LINE__, NDBD_EXIT_SR_OTHERNODEFAILED, buf);
		ndbrequire(false);
		}

		guard0 = cnoPrepFailedNodes - 1;
		arrGuard(guard0, MAX_NDB_NODES);
		for (Tindex = 0; Tindex <= guard0; Tindex++) {
		@@ -3157,6 +3178,18 @@ Qmgr::sendCommitFailReq(Signal* signal)
		for (nodePtr.i = 1; nodePtr.i < MAX_NDB_NODES; nodePtr.i++) {
		jam();
		ptrAss(nodePtr, nodeRec);

		#ifdef ERROR_INSERT
		if (ERROR_INSERTED(935) && nodePtr.i == c_error_insert_extra)
		{
		ndbout_c("skipping node %d", c_error_insert_extra);
		CLEAR_ERROR_INSERT_VALUE;
		signal->theData[0] = 9999;
		sendSignalWithDelay(CMVMI_REF, GSN_NDB_TAMPER, signal, 1000, 1);
		continue;
		}
		#endif

		if (nodePtr.p->phase == ZRUNNING) {
		jam();
		nodePtr.p->sendCommitFailReqStatus = Q_ACTIVE;
		@@ -3227,6 +3260,33 @@ void Qmgr::execPREP_FAILREF(Signal* signal)
		return;
		}//Qmgr::execPREP_FAILREF()

		static
		Uint32
		clear_nodes(Uint32 dstcnt, Uint16 dst[], Uint32 srccnt, const Uint16 src[])
		{
		if (srccnt == 0)
		return dstcnt;

		Uint32 pos = 0;
		for (Uint32 i = 0; i<dstcnt; i++)
		{
		Uint32 node = dst[i];
		for (Uint32 j = 0; j<srccnt; j++)
		{
		if (node == dst[j])
		{
		node = RNIL;
		break;
		}
		}
		if (node != RNIL)
		{
		dst[pos++] = node;
		}
		}
		return pos;
		}

		/---------------------------------------------------------------------------/
		/* THE PRESIDENT IS NOW COMMITTING THE PREVIOUSLY PREPARED NODE FAILURE. */
		/---------------------------------------------------------------------------/
		@@ -3314,19 +3374,18 @@ void Qmgr::execCOMMIT_FAILREQ(Signal* signal)
		NodeFailRep::SignalLength, JBB);
		}//if
		}//for
		if (cpresident != getOwnNodeId()) {
		jam();
		cnoFailedNodes = cnoCommitFailedNodes - cnoFailedNodes;
		if (cnoFailedNodes > 0) {
		jam();
		guard0 = cnoFailedNodes - 1;
		arrGuard(guard0 + cnoCommitFailedNodes, MAX_NDB_NODES);
		for (Tj = 0; Tj <= guard0; Tj++) {
		jam();
		cfailedNodes[Tj] = cfailedNodes[Tj + cnoCommitFailedNodes];
		}//for
		}//if
		}//if

		/**
		* Remove committed nodes from failed/prepared
		*/
		cnoFailedNodes = clear_nodes(cnoFailedNodes,
		cfailedNodes,
		cnoCommitFailedNodes,
		ccommitFailedNodes);
		cnoPrepFailedNodes = clear_nodes(cnoPrepFailedNodes,
		cprepFailedNodes,
		cnoCommitFailedNodes,
		ccommitFailedNodes);
		cnoCommitFailedNodes = 0;
		}//if
		/**-----------------------------------------------------------------------
		@@ -4705,6 +4764,14 @@ Qmgr::execDUMP_STATE_ORD(Signal* signal)
		default:
		;
		}//switch

		#ifdef ERROR_INSERT
		if (signal->theData[0] == 935 && signal->getLength() == 2)
		{
		SET_ERROR_INSERT_VALUE(935);
		c_error_insert_extra = signal->theData[1];
		}
		#endif
		}//Qmgr::execDUMP_STATE_ORD()

		void Qmgr::execSET_VAR_REQ(Signal* signal)