Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:coreos/etcd

Browse Source 
Conflicts:
	server/peer_server_handlers.go
This commit is contained in:
Yicheng Qin
2014-05-08 13:17:51 -07:00
parent e960a0e03c 015d228b04
commit c92231c91a
13 changed files with 96 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/peer_server.go
View File

@@ -696,8 +696,8 @@ func (s *PeerServer) monitorActiveSize() {
// Retrieve target active size and actual active size.
activeSize := s.ClusterConfig().ActiveSize
peerCount := s.registry.Count()
peers := s.registry.Names()
peerCount := s.registry.Count()
if index := sort.SearchStrings(peers, s.Config.Name); index < len(peers) && peers[index] == s.Config.Name {
peers = append(peers[:index], peers[index+1:]...)
}