kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Restore old behavior and have AddPrimaryServer() return a pointer to the existing server (vs nil when the server already exists).

Browse Source
This commit is contained in:
Sean Chittenden
2016-06-10 16:46:49 -04:00
parent a0902c3f45
commit 4e543b6d43
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/rpcproxy/rpcproxy.go
View File

@@ -229,7 +229,7 @@ func (p *RPCProxy) AddPrimaryServer(rpcAddr string) *ServerEndpoint {
p.serverListLock.Lock()
if serverExists := p.primaryServers.serverExistByKey(k); serverExists {
p.serverListLock.Unlock()
return nil
return s
}
p.primaryServers.L = append(p.primaryServers.L, s)
p.serverListLock.Unlock()
@@ -490,7 +490,7 @@ func (p *RPCProxy) RebalanceServers() {
// Verify that all servers are present. Reconcile will save the
// final serverList.
if p.reconcileServerList(l) {
p.logger.Printf("[DEBUG] client.rpcproxy: Rebalanced %d servers, next active server is %s/%v", len(l.L), l.L[0].String(), l)
p.logger.Printf("[TRACE] client.rpcproxy: Rebalanced %d servers, next active server is %s", len(l.L), l.L[0].String())
} else {
// reconcileServerList failed because Nomad removed the
// server that was at the front of the list that had