Commit 55640f60 authored by unknown's avatar unknown
Browse files

ndb - bug#24461

m  ove mlock to much earlier in startphases
  not to affect heartbeats


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  move mlock to much earlier in startphases
    not to affect heartbeats
parent 9e9f5fc2
Loading
Loading
Loading
Loading
+10 −8
Original line number Diff line number Diff line
@@ -311,6 +311,16 @@ void Cmvmi::execSTTOR(Signal* signal)
  jamEntry();
  if (theStartPhase == 1){
    jam();

    if(theConfig.lockPagesInMainMemory())
    {
      int res = NdbMem_MemLockAll();
      if(res != 0){
	g_eventLogger.warning("Failed to memlock pages");
	warningEvent("Failed to memlock pages");
      }
    }
    
    sendSTTORRY(signal);
    return;
  } else if (theStartPhase == 3) {
@@ -330,14 +340,6 @@ void Cmvmi::execSTTOR(Signal* signal)
    signal->theData[2] = NodeInfo::REP;
    execOPEN_COMREQ(signal);    
    globalData.theStartLevel = NodeState::SL_STARTED;

    if(theConfig.lockPagesInMainMemory()){
      int res = NdbMem_MemLockAll();
      if(res != 0){
	g_eventLogger.warning("Failed to memlock pages");
	warningEvent("Failed to memlock pages");
      }
    }
    sendSTTORRY(signal);
  }
}