enable DialerTimeout for bserver (suggested by @strib)

keybase · Dec 4, 2017 · 16fd06f · 16fd06f
1 parent 14c0a0f
commit 16fd06f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/libkbfs/bserver_remote.go b/libkbfs/bserver_remote.go
@@ -76,6 +76,7 @@ func newBlockServerRemoteClientHandler(name string, log logger.Logger,
 		WrapErrorFunc:                 libkb.WrapError,
 		TagsFunc:                      libkb.LogTagsFromContext,
 		ReconnectBackoff:              func() backoff.BackOff { return constBackoff },
+		DialerTimeout:                 dialerTimeout,
 		InitialReconnectBackoffWindow: bserverReconnectBackoffWindow,
 	}
 	b.initNewConnection()

diff --git a/libkbfs/constants.go b/libkbfs/constants.go
@@ -27,3 +27,7 @@ const bserverReconnectBackoffWindow = time.Hour
 // registerForUpdatesFireNowThreshold is the maximum length of time that
 // KBFS can be idle for, in order to trigger FireNow from RegisterForUpdate.
 const registerForUpdatesFireNowThreshold = 10 * time.Minute
+
+// dialerTimeout is the TCP dial timeout used by mdserver and bserver RPC
+// connections.
+const dialerTimeout = 16 * time.Second
diff --git a/libkbfs/mdserver_remote.go b/libkbfs/mdserver_remote.go
@@ -82,8 +82,6 @@ var _ kbfscrypto.AuthTokenRefreshHandler = (*MDServerRemote)(nil)
 // Test that MDServerRemote fully implements the ConnectionHandler interface.
 var _ rpc.ConnectionHandler = (*MDServerRemote)(nil)
 
-const dialerTimeout = 16 * time.Second
-
 // NewMDServerRemote returns a new instance of MDServerRemote.
 func NewMDServerRemote(config Config, srvRemote rpc.Remote,
 	rpcLogFactory rpc.LogFactory) *MDServerRemote {
@@ -111,11 +109,10 @@ func NewMDServerRemote(config Config, srvRemote rpc.Remote,
 		"libkbfs_mdserver_remote", VersionString(), mdServer)
 	constBackoff := backoff.NewConstantBackOff(RPCReconnectInterval)
 	mdServer.connOpts = rpc.ConnectionOpts{
-		WrapErrorFunc:    libkb.WrapError,
-		TagsFunc:         libkb.LogTagsFromContext,
-		ReconnectBackoff: func() backoff.BackOff { return constBackoff },
-		DialerTimeout:    dialerTimeout,
-
+		WrapErrorFunc:                 libkb.WrapError,
+		TagsFunc:                      libkb.LogTagsFromContext,
+		ReconnectBackoff:              func() backoff.BackOff { return constBackoff },
+		DialerTimeout:                 dialerTimeout,
 		InitialReconnectBackoffWindow: mdserverReconnectBackoffWindow,
 	}
 	mdServer.initNewConnection()