Commit 71996bd6 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) 

  Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
parent f6c0acde

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

+23 −4
Original line number Diff line number Diff line
@@ -11164,6 +11164,13 @@ void Dblqh::sendLCP_COMPLETE_REP(Signal* signal, Uint32 lcpId) 
    jam();

    sendEMPTY_LCP_CONF(signal, true);

  }









  if (getNodeState().getNodeRestartInProgress())









  {









    jam();









    ndbrequire(cstartRecReq == 2);









    cstartRecReq = 3;









  }









  return;









}//Dblqh::sendCOMP_LCP_ROUND()
















@@ -11729,16 +11736,28 @@ void Dblqh::execGCP_SAVEREQ(Signal* signal)







    return;









  }









  









  ccurrentGcprec = 0;









  gcpPtr.i = ccurrentGcprec;









  ptrCheckGuard(gcpPtr, cgcprecFileSize, gcpRecord);









  









  cnewestCompletedGci = gci;









  if (gci > cnewestGci) {









    jam();









    cnewestGci = gci;









  }//if

















  if(getNodeState().getNodeRestartInProgress() && cstartRecReq < 3)









  {









    GCPSaveRef * const saveRef = (GCPSaveRef*)&signal->theData[0];









    saveRef->dihPtr = dihPtr;









    saveRef->nodeId = getOwnNodeId();









    saveRef->gci    = gci;









    saveRef->errorCode = GCPSaveRef::NodeRestartInProgress;









    sendSignal(dihBlockRef, GSN_GCP_SAVEREF, signal, 









	       GCPSaveRef::SignalLength, JBB);









    return;









  }

















  ccurrentGcprec = 0;









  gcpPtr.i = ccurrentGcprec;









  ptrCheckGuard(gcpPtr, cgcprecFileSize, gcpRecord);









  









  gcpPtr.p->gcpBlockref = dihBlockRef;









  gcpPtr.p->gcpUserptr = dihPtr;









  gcpPtr.p->gcpId = gci;