fix bug: avoid propose with null membership.

journeyqiao · Sep 9, 2016 · 3c807e9 · 3c807e9
1 parent f6f67b6
commit 3c807e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/config/system_v_sm.cpp b/src/config/system_v_sm.cpp
@@ -271,7 +271,7 @@ const bool SystemVSM :: IsValidNodeID(const nodeid_t iNodeID)
 
 const bool SystemVSM :: IsIMInMembership()
 {
-    return IsValidNodeID(m_iMyNodeID);
+    return m_setNodeID.find(m_iMyNodeID) != end(m_setNodeID);
 }
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/test/test_server.cpp b/src/test/test_server.cpp
@@ -126,6 +126,11 @@ int TestServer :: Ready()
     {
         printf("ready paxos ok, ip %s port %d\n", m_oMyNode.GetIP().c_str(), m_oMyNode.GetPort());
     }
+    else 
+    {
+        printf("ready paxos fail, ip %s port %d ret %d\n", 
+                m_oMyNode.GetIP().c_str(), m_oMyNode.GetPort(), ret);
+    }
 
     return ret;
 }