fix: restore the old rank assign scheme (kleveross#70)

Author: zw0610

ftlib/impl.py

@@ -46,7 +46,7 @@ def __init__(
 
         self.rank = None
         self.size = None
-        self.member_list = None
+        self.member_list = []
 
         self.consensus = None
         self.commlib = None

ftlib/rank_assign_scheme.py

@@ -14,6 +14,7 @@ def get_rank_size(member_list, self_identity, old_member_list=[]):
     #     str, ip (identity) of the 0-rank worker
     logging.debug("start to assigning rank")
     logging.debug("member_list: {}".format(member_list))
+    logging.debug("old_member_list: {}".format(old_member_list))
     logging.debug("self_identity: {}".format(self_identity))
     if self_identity not in member_list:
         raise RuntimeError(
@@ -25,20 +26,8 @@ def hash_ip(ip):
 
     hashed_member_dict = {hash_ip(m): m for m in member_list}
     hashed_member_list = sorted(hashed_member_dict.keys())
-
-    # To address issue on broadcast after rebuild
-    # https://github.com/caicloud/ftlib/issues/51
-    # Re-arrange the hashed_member_list
-    candidate_idx = 1
-    if hashed_member_list[0] not in old_member_list:
-        assert len(old_member_list) > 0
-        while candidate_idx < len(hashed_member_list):
-            if hashed_member_list[candidate_idx] in old_member_list:
-                break
-        assert hashed_member_list[candidate_idx] in old_member_list
-        temp = hashed_member_list[0]
-        hashed_member_list[0] = hashed_member_list[candidate_idx]
-        hashed_member_list[candidate_idx] = temp
+    logging.debug(f"hashed_member_dict = {hashed_member_dict}")
+    logging.debug(f"hashed_member_list = {hashed_member_list}")
 
     return (
         hashed_member_list.index(hash_ip(self_identity)),