Merge pull request #1474 from jonboulle/1474_print_peers

print out remote peers' information and config change in the cluster

etcdserver/etcdhttp/client.go

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

etcdserver/server.go

@@ -235,6 +235,9 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
 			index = snapshot.Index
 		}
 		cfg.Cluster = NewClusterFromStore(cfg.Cluster.token, st)
+		if snapshot != nil {
+			log.Printf("etcdserver: loaded peers from snapshot: %s", cfg.Cluster)
+		}
 		if !cfg.ForceNewCluster {
 			id, n, w = restartNode(cfg, index, snapshot)
 		} else {
@@ -663,12 +666,12 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange) error {
 		}
 		s.Cluster.AddMember(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:
 		id := types.ID(cc.NodeID)
 		s.Cluster.RemoveMember(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
 }