From 58246fcc0b2e8b5b3d575070dac73c3bcdd928c9 Mon Sep 17 00:00:00 2001 From: Sean Chittenden Date: Fri, 25 Mar 2016 13:46:18 -0700 Subject: [PATCH] Initialize the rebalancce to clientRPCMinReuseDuration In an earlier version there was a channel to notify when a new server was added, however this has long since been removed. Just default to the sane value of 2min before the first rebalance calc takes place. Pointed out by: slackpad --- consul/server_manager/server_manager.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/consul/server_manager/server_manager.go b/consul/server_manager/server_manager.go index 7e2e213d33..5fec577e64 100644 --- a/consul/server_manager/server_manager.go +++ b/consul/server_manager/server_manager.go @@ -31,11 +31,6 @@ const ( // queries are sent over an established connection to a single server clientRPCMinReuseDuration = 120 * time.Second - // initialRebalanceTimeout is the initial value for the - // rebalanceTimer. This value is discarded immediately after the - // client becomes aware of the first server. - initialRebalanceTimeout = 24 * time.Hour - // Limit the number of new connections a server receives per second // for connection rebalancing. This limit caps the load caused by // continual rebalancing efforts when a cluster is in equilibrium. A @@ -299,7 +294,7 @@ func (sm *ServerManager) refreshServerRebalanceTimer(timer *time.Timer) time.Dur // the list. The order of the server list must be shuffled periodically to // distribute load across all known and available consul servers. func (sm *ServerManager) Start() { - var rebalanceTimer *time.Timer = time.NewTimer(initialRebalanceTimeout) + var rebalanceTimer *time.Timer = time.NewTimer(clientRPCMinReuseDuration) var rebalanceTaskDispatched int32 func() {