GetAllNodes also go through the consistency process

PikaLabs · Dec 28, 2017 · d76ac91 · d76ac91
1 parent 4085705
commit d76ac91
Show file tree

Hide file tree

Showing 9 changed files with 226 additions and 72 deletions.
diff --git a/floyd/example/simple/remove_server.cc b/floyd/example/simple/remove_server.cc
@@ -15,6 +15,20 @@ uint64_t NowMicros() {
   return static_cast<uint64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
 }
 
+bool print_members(Floyd* f) {
+  std::set<std::string> nodes;
+  Status s = f->GetAllServers(&nodes);
+  if (!s.ok()) {
+    return false;
+  }
+  printf("Membership: ");
+  for (const std::string& n : nodes) {
+    printf(" %s", n.c_str());
+  }
+  printf("\n");
+  return true;
+}
+
 int main()
 {
   slash::Status s;
@@ -44,9 +58,7 @@ int main()
   std::string msg;
 
   while (1) {
-    if (f1->HasLeader()) {
-      f1->GetServerStatus(&msg);
-      printf("%s\n", msg.c_str());
+    if (print_members(f1)) {
       break;
     }
     printf("electing leader... sleep 2s\n");
@@ -74,9 +86,7 @@ int main()
   printf("Remove out server4 status %s\n", s.ToString().c_str());
 
   while (1) {
-    if (f1->HasLeader()) {
-      f1->GetServerStatus(&msg);
-      printf("%s\n", msg.c_str());
+    if (print_members(f1)) {
       break;
     }
     printf("electing leader after server 4 leave the cluster... sleep 2s\n");
@@ -97,9 +107,7 @@ int main()
   delete f5;
   printf("Remove out server5 status %s\n", s.ToString().c_str());
   while (1) {
-    if (f1->HasLeader()) {
-      f1->GetServerStatus(&msg);
-      printf("%s\n", msg.c_str());
+    if (print_members(f1)) {
       break;
     }
     printf("electing leader after server 5 leave the cluster... sleep 2s\n");

diff --git a/floyd/include/floyd.h b/floyd/include/floyd.h
@@ -39,8 +39,8 @@ class Floyd  {
   virtual bool GetLeader(std::string* ip_port) = 0;
   virtual bool GetLeader(std::string* ip, int* port) = 0;
   virtual bool HasLeader() = 0;
-  virtual bool GetAllNodes(std::set<std::string>* nodes) = 0;
   virtual bool IsLeader() = 0;
+  virtual Status GetAllServers(std::set<std::string>* nodes) = 0;
 
   // used for debug
   virtual bool GetServerStatus(std::string* msg) = 0;

diff --git a/floyd/proto/floyd.proto b/floyd/proto/floyd.proto
@@ -12,6 +12,7 @@ message Entry {
     kUnLock = 5;
     kAddServer = 6;
     kRemoveServer = 7;
+    kGetAllServers = 8;
   }
   // used in key value operator
   optional uint64 term = 1;
@@ -36,6 +37,7 @@ enum Type {
   kUnLock = 6;
   kAddServer = 11;
   kRemoveServer = 12;
+  kGetAllServers = 13;
 
   // Raft RPC
   kRequestVote = 8;
@@ -142,6 +144,8 @@ message CmdResponse {
     optional uint64 last_applied = 10;
   }
   optional ServerStatus server_status = 7;
+
+  optional Membership all_servers = 8;
 }
 
 /*
@@ -164,3 +168,4 @@ message Membership {
 }
 
 
+
diff --git a/floyd/src/floyd.pb.cc b/floyd/src/floyd.pb.cc