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 pull request #1474 from jonboulle/1474_print_peers

Browse Source 
print out remote peers' information and config change in the cluster
This commit is contained in:
Jonathan Boulle 2014-11-07 13:39:32 -08:00
commit a6ba4d357c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcdserver/etcdhttp/client.go
View File

@ -223,7 +223,6 @@ func (h *membersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
log.Printf("etcdhttp: error removing node %s: %v", id, err) log.Printf("etcdhttp: error removing node %s: %v", id, err)
writeError(w, err) writeError(w, err)
default: default:
log.Printf("etcdhttp: removed node %x", id)
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} }
} }

7
etcdserver/server.go
View File

@ -235,6 +235,9 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
index = snapshot.Index index = snapshot.Index
} }
cfg.Cluster = NewClusterFromStore(cfg.Cluster.token, st) cfg.Cluster = NewClusterFromStore(cfg.Cluster.token, st)
if snapshot != nil {
log.Printf("etcdserver: loaded peers from snapshot: %s", cfg.Cluster)
}
if !cfg.ForceNewCluster { if !cfg.ForceNewCluster {
id, n, w = restartNode(cfg, index, snapshot) id, n, w = restartNode(cfg, index, snapshot)
} else { } else {
@ -663,12 +666,12 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange) error {
} }
s.Cluster.AddMember(m) s.Cluster.AddMember(m)
s.sender.Add(m) s.sender.Add(m)
log.Printf("etcdserver: added node %s to cluster", types.ID(cc.NodeID)) log.Printf("etcdserver: added node %s %v to cluster %s", types.ID(cc.NodeID), m.PeerURLs, s.Cluster.ID())
case raftpb.ConfChangeRemoveNode: case raftpb.ConfChangeRemoveNode:
id := types.ID(cc.NodeID) id := types.ID(cc.NodeID)
s.Cluster.RemoveMember(id) s.Cluster.RemoveMember(id)
s.sender.Remove(id) s.sender.Remove(id)
log.Printf("etcdserver: removed node %s from cluster", id) log.Printf("etcdserver: removed node %s from cluster %s", id, s.Cluster.ID())
} }
return nil return nil
} }