status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Comment updates

This commit is contained in:
Sean Chittenden 2016-03-25 13:06:59 -07:00
parent 0b3f6932df
commit 9c18bb5f1c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
consul/server_manager/server_manager.go
View File

@ -232,7 +232,8 @@ func (sm *ServerManager) NumServers() (numServers int) {
// Elsewhere we rely on the position in the server list as a hint regarding // Elsewhere we rely on the position in the server list as a hint regarding
// the stability of a server relative to its position in the server list. // the stability of a server relative to its position in the server list.
// Servers at or near the front of the list are more stable than servers near // Servers at or near the front of the list are more stable than servers near
// the end of the list. // the end of the list. Unhealthy servers are removed when serf notices the
// server has been deregistered.
func (sm *ServerManager) RebalanceServers() { func (sm *ServerManager) RebalanceServers() {
sm.serverConfigLock.Lock() sm.serverConfigLock.Lock()
defer sm.serverConfigLock.Unlock() defer sm.serverConfigLock.Unlock()
@ -241,9 +242,7 @@ func (sm *ServerManager) RebalanceServers() {
newServers := make([]*server_details.ServerDetails, len(serverCfg.servers)) newServers := make([]*server_details.ServerDetails, len(serverCfg.servers))
copy(newServers, serverCfg.servers) copy(newServers, serverCfg.servers)
// Shuffle the server list on server join. Servers are selected from // Shuffle the server list
// the head of the list and are moved to the end of the list on
// failure.
for i := len(serverCfg.servers) - 1; i > 0; i-- { for i := len(serverCfg.servers) - 1; i > 0; i-- {
j := rand.Int31n(int32(i + 1)) j := rand.Int31n(int32(i + 1))
newServers[i], newServers[j] = newServers[j], newServers[i] newServers[i], newServers[j] = newServers[j], newServers[i]