add MasterRenewInterval

include/phxpaxos/node.h

@@ -137,6 +137,8 @@ class Node
 
     virtual int SetMasterLease(const int iGroupIdx, const int iLeaseTimeMs) = 0;
 
+    virtual int SetMasterRenewInterval(const int iGroupIdx, const int iRenewIntervalTimeMs) = 0;
+
     virtual int DropMaster(const int iGroupIdx) = 0;
 
     //Qos

src/master/master_mgr.cpp

@@ -34,6 +34,7 @@ MasterMgr :: MasterMgr(
     : m_oDefaultMasterSM(poLogStorage, poPaxosNode->GetMyNodeID(), iGroupIdx, pMasterChangeCallback) 
 {
     m_iLeaseTime = 10000;
+    m_iRenewIntervalTimeMs = 0;
 
     m_poPaxosNode = (Node *)poPaxosNode;
     m_iMyGroupIdx = iGroupIdx;
@@ -63,6 +64,11 @@ void MasterMgr :: SetLeaseTime(const int iLeaseTimeMs)
     m_iLeaseTime = iLeaseTimeMs;
 }
 
+void MasterMgr :: SetMasterRenewInterval(const int iRenewIntervalTimeMs)
+{
+    m_iRenewIntervalTimeMs = iRenewIntervalTimeMs;
+}
+
 void MasterMgr :: DropMaster()
 {
     m_bNeedDropMaster = true;
@@ -94,12 +100,13 @@ void MasterMgr :: run()
         }
 
         int iLeaseTime = m_iLeaseTime;
+        int iRenewIntervalTimeMs = m_iRenewIntervalTimeMs;
 
         uint64_t llBeginTime = Time::GetSteadyClockMS();
 
         TryBeMaster(iLeaseTime);
 
-        int iContinueLeaseTimeout = (iLeaseTime - 100) / 4;
+        int iContinueLeaseTimeout = iRenewIntervalTimeMs ? iRenewIntervalTimeMs : (iLeaseTime - 100) / 4;
         iContinueLeaseTimeout = iContinueLeaseTimeout / 2 + OtherUtils::FastRand() % iContinueLeaseTimeout;
 
         if (m_bNeedDropMaster)

src/master/master_mgr.h

@@ -48,6 +48,8 @@ class MasterMgr : public Thread
 
     void SetLeaseTime(const int iLeaseTimeMs);
 
+    void SetMasterRenewInterval(const int iRenewIntervalTimeMs);
+
     void TryBeMaster(const int iLeaseTime);
 
     void DropMaster();
@@ -62,6 +64,7 @@ class MasterMgr : public Thread
 
 private:
     int m_iLeaseTime;
+    int m_iRenewIntervalTimeMs;
 
     bool m_bIsEnd;
     bool m_bIsStarted;

src/node/pnode.cpp

@@ -671,6 +671,17 @@ int PNode :: SetMasterLease(const int iGroupIdx, const int iLeaseTimeMs)
     return 0;
 }
 
+int PNode :: SetMasterRenewInterval(const int iGroupIdx, const int iRenewIntervalTimeMs)
+{
+    if (!CheckGroupID(iGroupIdx))
+    {
+        return Paxos_GroupIdxWrong;
+    }
+
+    m_vecMasterList[iGroupIdx]->SetMasterRenewInterval(iRenewIntervalTimeMs);
+    return 0;
+}
+
 int PNode :: DropMaster(const int iGroupIdx)
 {
     if (!CheckGroupID(iGroupIdx))

src/node/pnode.h

@@ -85,6 +85,7 @@ class PNode : public Node
     const NodeInfo GetMasterWithVersion(const int iGroupIdx, uint64_t & llVersion);
     const bool IsIMMaster(const int iGroupIdx);
     int SetMasterLease(const int iGroupIdx, const int iLeaseTimeMs);
+    int SetMasterRenewInterval(const int iGroupIdx, const int iRenewIntervalTimeMs);
     int DropMaster(const int iGroupIdx);
 
 public: