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

Commit a handful of refactoring && copy/paste-o fixes

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

32
consul/server_manager/server_manager.go
View file

@ -120,8 +120,9 @@ func (sm *ServerManager) AddServer(server *server_details.ServerDetails) {
// Add to the list if not known // Add to the list if not known
if !found { if !found {
newServers := make([]*server_details.ServerDetails, len(serverCfg.servers)+1) newServers := make([]*server_details.ServerDetails, len(serverCfg.servers), len(serverCfg.servers)+1)
copy(newServers, serverCfg.servers) copy(newServers, serverCfg.servers)
newServers = append(newServers, server)
serverCfg.servers = newServers serverCfg.servers = newServers
// Notify the server maintenance task of a new server // Notify the server maintenance task of a new server
@ -157,17 +158,16 @@ func (sm *ServerManager) CycleFailedServers() {
// server and enqueued it at the end of the list. cycleServers assumes the // server and enqueued it at the end of the list. cycleServers assumes the
// caller is holding the serverConfigLock. // caller is holding the serverConfigLock.
func (sc *serverConfig) cycleServer() (servers []*server_details.ServerDetails) { func (sc *serverConfig) cycleServer() (servers []*server_details.ServerDetails) {
numServers := len(servers) numServers := len(sc.servers)
if numServers < 2 { if numServers < 2 {
// No action required // No action required
return servers return servers
} }
var dequeuedServer *server_details.ServerDetails newServers := make([]*server_details.ServerDetails, 0, numServers)
newServers := make([]*server_details.ServerDetails, len(servers)+1) newServers = append(newServers, sc.servers[1:]...)
dequeuedServer, newServers = servers[0], servers[1:] newServers = append(newServers, sc.servers[0])
servers = append(newServers, dequeuedServer) return newServers
return servers
} }
// FindHealthyServer takes out an internal "read lock" and searches through // FindHealthyServer takes out an internal "read lock" and searches through
@ -203,23 +203,25 @@ func (sm *ServerManager) GetNumServers() (numServers int) {
return numServers return numServers
} }
// getServerConfig is a convenience method to hide the locking semantics of // getServerConfig is a convenience method which hides the locking semantics
// atomic.Value from the caller. // of atomic.Value from the caller.
func (sm *ServerManager) getServerConfig() serverConfig { func (sm *ServerManager) getServerConfig() serverConfig {
return sm.serverConfigValue.Load().(serverConfig) return sm.serverConfigValue.Load().(serverConfig)
} }
// NewServerManager is the only way to safely create a new ServerManager // NewServerManager is the only way to safely create a new ServerManager
// struct. // struct.
//
// NOTE(sean@): We can not pass in *consul.Client due to an import cycle
func NewServerManager(logger *log.Logger, shutdownCh chan struct{}) (sm *ServerManager) { func NewServerManager(logger *log.Logger, shutdownCh chan struct{}) (sm *ServerManager) {
// NOTE(sean@): Can't pass *consul.Client due to an import cycle
sm = new(ServerManager) sm = new(ServerManager)
// Create the initial serverConfig
serverCfg := serverConfig{}
sm.logger = logger sm.logger = logger
sm.consulServersCh = make(chan consulServerEventTypes, maxConsulServerManagerEvents)
sm.shutdownCh = shutdownCh sm.shutdownCh = shutdownCh
sm.serverConfigValue.Store(serverCfg)
sc := serverConfig{}
sc.servers = make([]*server_details.ServerDetails, 0)
sc.rebalanceTimer = time.NewTimer(time.Duration(initialRebalanceTimeoutHours * time.Hour))
sm.serverConfigValue.Store(sc)
return sm return sm
} }
@ -245,7 +247,7 @@ func (sm *ServerManager) RebalanceServers() {
defer sm.serverConfigLock.Unlock() defer sm.serverConfigLock.Unlock()
serverCfg := sm.getServerConfig() serverCfg := sm.getServerConfig()
newServers := make([]*server_details.ServerDetails, len(serverCfg.servers)+1) 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 on server join. Servers are selected from