feat: add option for tcp_timeout (kleveross#66)

Author: zw0610

ftlib/consensus/gossip/impl.py

@@ -20,6 +20,8 @@ def __init__(
         log_file="/tmp/memberlist.log",
         custom_bind_addr="",
         custom_advertise_addr="",
+        custom_tcp_timeout=0,
+        wait_time_after_join=5,
     ):
         super(Gossip, self).__init__()
 
@@ -39,6 +41,7 @@ def __init__(
             log_file.encode("utf-8"),
             custom_bind_addr.encode("utf-8"),
             custom_advertise_addr.encode("utf-8"),
+            custom_tcp_timeout,
         )
         if res != 0:
             raise RuntimeError("failed to initialize memberlist")
@@ -48,7 +51,9 @@ def __init__(
             if not joined:
                 raise RuntimeError("failed to join the group")
 
-        time.sleep(5)
+        # we need to take a sleep here because the group may add further nodes
+        # after this node succeeded joining the group
+        time.sleep(wait_time_after_join)
 
         self._ml_changed = False
         self._cache = self.get_memberlist()

ftlib/consensus/gossip/memberlist/main.go

@@ -12,6 +12,7 @@ import (
     "fmt"
     "github.com/hashicorp/memberlist"
     "os"
+    "time"
 )
 
 var list *memberlist.Memberlist
@@ -25,6 +26,7 @@ func init_memberlist(
     cLogFileName *C.char,
     cBindAddr *C.char,
     cAdvertiseAddr *C.char,
+    cTCPTimeout C.int,
     ) C.int {
     var err error
     config := memberlist.DefaultLocalConfig()
@@ -41,6 +43,10 @@ func init_memberlist(
         config.AdvertiseAddr = customAdvertiseAddr
     }
 
+    if cTCPTimeout > 0 {
+        config.TCPTimeout = cTCPTimeout * time.Second
+    }
+
     if logFileName != "" {
         fmt.Printf("log file: %s\n", logFileName)
         f, err := os.Create(logFileName)