Commit 13bb3c55 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

bug#15587 - ndb 

  Fix error in NF during NR
parent bfb8a71f

ndb/include/kernel/signaldata/DumpStateOrd.hpp

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ public: 
    LqhDumpAllScanRec = 2301,

    LqhDumpAllActiveScanRec = 2302,

    LqhDumpLcpState = 2303,

    LqhErrorInsert5042 = 2315,



    AccDumpOneScanRec = 2400,

    AccDumpAllScanRec = 2401,

    AccDumpAllActiveScanRec = 2402,

ndb/src/kernel/blocks/ERROR_codes.txt

+3 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ Insert node failure handling when receiving COMPLETEREQ. 
5006:

Insert node failure handling when receiving ABORTREQ.



5042:

As 5002, but with specified table (see DumpStateOrd)



These error code can be combined with error codes for testing time-out

handling in DBTC to ensure that node failures are also well handled in

time-out handling. They can also be used to test multiple node failure

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

+12 −2
Original line number Diff line number Diff line
@@ -5187,15 +5187,16 @@ void Dbdih::removeNodeFromTable(Signal* signal, 
    /**

     * For each of replica record

     */

    Uint32 replicaNo = 0;

    bool found = false;

    ReplicaRecordPtr replicaPtr;

    for(replicaPtr.i = fragPtr.p->storedReplicas; replicaPtr.i != RNIL;

        replicaPtr.i = replicaPtr.p->nextReplica, replicaNo++) {

        replicaPtr.i = replicaPtr.p->nextReplica) {

      jam();



      ptrCheckGuard(replicaPtr, creplicaFileSize, replicaRecord);

      if(replicaPtr.p->procNode == nodeId){

        jam();

	found = true;

	noOfRemovedReplicas++;

	removeNodeFromStored(nodeId, fragPtr, replicaPtr);

	if(replicaPtr.p->lcpOngoingFlag){
@@ -5211,6 +5212,15 @@ void Dbdih::removeNodeFromTable(Signal* signal, 
	}

      }

    }

    if (!found)

    {

      jam();

      /**

       * Run updateNodeInfo to remove any dead nodes from list of activeNodes

       *  see bug#15587

       */

      updateNodeInfo(fragPtr);

    }

    noOfRemainingLcpReplicas += fragPtr.p->noLcpReplicas;

  }

ndb/src/kernel/blocks/dblqh/Dblqh.hpp

+1 −0
Original line number Diff line number Diff line
@@ -2881,6 +2881,7 @@ private: 
  UintR ctransidHash[1024];

  

  Uint32 c_diskless;

  Uint32 c_error_insert_table_id;

  

public:

  /**

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+7 −2
Original line number Diff line number Diff line
@@ -3532,6 +3532,7 @@ void Dblqh::execLQHKEYREQ(Signal* signal) 
    jam();

    regTcPtr->activeCreat = ZTRUE;

    CRASH_INSERTION(5002);

    CRASH_INSERTION2(5042, tabptr.i == c_error_insert_table_id);

  } else {

    regTcPtr->activeCreat = ZFALSE;

  }//if
@@ -18402,7 +18403,11 @@ Dblqh::execDUMP_STATE_ORD(Signal* signal) 
    return;

  }

















  if (dumpState->args[0] == DumpStateOrd::LqhErrorInsert5042 && signal->getLength() == 2)









  {









    c_error_insert_table_id = dumpState->args[1];









    SET_ERROR_INSERT_VALUE(5042);









  }









  









}//Dblqh::execDUMP_STATE_ORD()