luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Use saveServerConfig vs atomic.Value.Store(config)

Browse source
This commit is contained in:
Sean Chittenden 2016-02-22 13:11:07 -08:00
parent 12377e80e6
commit c8ab3ae4cb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
consul/server_manager/server_manager.go
View file

@ -129,7 +129,7 @@ func (sm *ServerManager) AddServer(server *server_details.ServerDetails) {
sm.consulServersCh <- consulServersNodeJoin sm.consulServersCh <- consulServersNodeJoin
} }
sm.serverConfigValue.Store(serverCfg) sm.saveServerConfig(serverCfg)
} }
// CycleFailedServers takes out an internal write lock and dequeues all // CycleFailedServers takes out an internal write lock and dequeues all
@ -151,7 +151,7 @@ func (sm *ServerManager) CycleFailedServers() {
} }
serverCfg.resetRebalanceTimer(sm) serverCfg.resetRebalanceTimer(sm)
sm.serverConfigValue.Store(serverCfg) sm.saveServerConfig(serverCfg)
} }
// cycleServers returns a new list of servers that has dequeued the first // cycleServers returns a new list of servers that has dequeued the first
@ -260,7 +260,7 @@ func (sm *ServerManager) RebalanceServers() {
serverCfg.servers = newServers serverCfg.servers = newServers
serverCfg.resetRebalanceTimer(sm) serverCfg.resetRebalanceTimer(sm)
sm.serverConfigValue.Store(serverCfg) sm.saveServerConfig(serverCfg)
} }
// RemoveServer takes out an internal write lock and removes a server from // RemoveServer takes out an internal write lock and removes a server from
@ -285,7 +285,7 @@ func (sm *ServerManager) RemoveServer(server *server_details.ServerDetails) {
newServers = newServers[:n-1] newServers = newServers[:n-1]
serverCfg.servers = newServers serverCfg.servers = newServers
sm.serverConfigValue.Store(serverCfg) sm.saveServerConfig(serverCfg)
return return
} }
} }
@ -332,7 +332,7 @@ func (sm *ServerManager) StartServerManager() {
serverCfg = serverCfgPtr.(serverConfig) serverCfg = serverCfgPtr.(serverConfig)
serverCfg.resetRebalanceTimer(sm) serverCfg.resetRebalanceTimer(sm)
rebalanceTimer = serverCfg.rebalanceTimer rebalanceTimer = serverCfg.rebalanceTimer
sm.serverConfigValue.Store(serverCfg) sm.saveServerConfig(serverCfg)
}() }()
for { for {