Browse Source

etcdserver: log cluster when adding/removing node

Jonathan Boulle 11 years ago
parent
commit
ca06fd0060
2 changed files with 2 additions and 3 deletions
  1. 0 1
      etcdserver/etcdhttp/client.go
  2. 2 2
      etcdserver/server.go

+ 0 - 1
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)
 		}
 	}

+ 2 - 2
etcdserver/server.go

@@ -666,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 %v to cluster", types.ID(cc.NodeID), m.PeerURLs)
+		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
 }