From 13f31587285a9f4681e7c9708893b095fe3ff1ac Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Tue, 9 Dec 2014 15:55:42 -0800 Subject: [PATCH 1/3] etcdserver: improve discovery ignore warning --- Documentation/0.5/clustering.md | 2 +- etcdserver/server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/0.5/clustering.md b/Documentation/0.5/clustering.md index d088dd9ec..633abd681 100644 --- a/Documentation/0.5/clustering.md +++ b/Documentation/0.5/clustering.md @@ -199,7 +199,7 @@ ignored on this machine. ``` $ etcd -name infra0 -initial-advertise-peer-urls http://10.0.1.10:2380 \ -discovery https://discovery.etcd.io/3e86b59982e49066c5d813af1c2e2579cbf573de -etcdserver: warn: ignoring discovery: etcd has already been initialized and has a valid log in /var/lib/etcd +etcdserver: discovery token ignored since a cluster has already been initialized. Valid log found at /var/lib/etcd ``` # 0.4 to 0.5+ Migration Guide diff --git a/etcdserver/server.go b/etcdserver/server.go index e9dd4bf33..bf08b28cd 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -264,7 +264,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) { id, n, s, w = startNode(cfg, cfg.Cluster.MemberIDs()) case haveWAL: if cfg.ShouldDiscover() { - log.Printf("etcdserver: warn: ignoring discovery: etcd has already been initialized and has a valid log in %q", cfg.WALDir()) + log.Printf("etcdserver: discovery token ignored since a cluster has already been initialized. Valid log found at %q", cfg.WALDir()) } var index uint64 snapshot, err := ss.Load() From 4094812b39be7511d7db11d1418fe3892f436975 Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Tue, 9 Dec 2014 16:02:16 -0800 Subject: [PATCH 2/3] rafthttp: improve start/stop logging --- rafthttp/streamer.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rafthttp/streamer.go b/rafthttp/streamer.go index fa788a3dc..f0bc6833d 100644 --- a/rafthttp/streamer.go +++ b/rafthttp/streamer.go @@ -59,7 +59,7 @@ func startStreamServer(w WriteFlusher, to types.ID, term uint64, fs *stats.Follo done: make(chan struct{}), } go s.handle(w) - log.Printf("rafthttp: stream server to %s at term %d starts", to, term) + log.Printf("rafthttp: starting server stream to %s at term %d", to, term) return s } @@ -73,8 +73,8 @@ func (s *streamServer) send(ents []raftpb.Entry) error { case s.q <- ents: return nil default: - log.Printf("rafthttp: streamer reaches maximal serving to %s", s.to) - return fmt.Errorf("reach maximal serving") + log.Printf("rafthttp: maximum number of streams %s reached", s.to) + return fmt.Errorf("maximum number of streams reached") } } @@ -88,14 +88,14 @@ func (s *streamServer) stopNotify() <-chan struct{} { return s.done } func (s *streamServer) handle(w WriteFlusher) { defer func() { close(s.done) - log.Printf("rafthttp: stream server to %s at term %d is closed", s.to, s.term) + log.Printf("rafthttp: server streaming to %s at term %d has been stopped", s.to, s.term) }() ew := &entryWriter{w: w} for ents := range s.q { start := time.Now() if err := ew.writeEntries(ents); err != nil { - log.Printf("rafthttp: write ents error: %v", err) + log.Printf("rafthttp: encountered error writing to server log stream: %v", err) return } w.Flush() @@ -149,7 +149,7 @@ func (s *streamClient) start(tr http.RoundTripper, u string, cid types.ID) error } s.closer = resp.Body go s.handle(resp.Body) - log.Printf("rafthttp: stream client to %s at term %d starts", s.to, s.term) + log.Printf("rafthttp: starting client stream to %s at term %d", s.to, s.term) return nil } @@ -170,7 +170,7 @@ func (s *streamClient) isStopped() bool { func (s *streamClient) handle(r io.Reader) { defer func() { close(s.done) - log.Printf("rafthttp: stream client to %s at term %d is closed", s.to, s.term) + log.Printf("rafthttp: client streaming to %s at term %d is been stopped", s.to, s.term) }() er := &entryReader{r: r} @@ -178,7 +178,7 @@ func (s *streamClient) handle(r io.Reader) { ents, err := er.readEntries() if err != nil { if err != io.EOF { - log.Printf("rafthttp: read ents error: %v", err) + log.Printf("rafthttp: encountered error reading the client log stream: %v", err) } return } From 2593914973b6081355d6c6c8765c0548b03cffdb Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Wed, 10 Dec 2014 10:18:01 -0800 Subject: [PATCH 3/3] rafthttp: feedback --- rafthttp/streamer.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rafthttp/streamer.go b/rafthttp/streamer.go index f0bc6833d..dbf3a8b73 100644 --- a/rafthttp/streamer.go +++ b/rafthttp/streamer.go @@ -73,8 +73,8 @@ func (s *streamServer) send(ents []raftpb.Entry) error { case s.q <- ents: return nil default: - log.Printf("rafthttp: maximum number of streams %s reached", s.to) - return fmt.Errorf("maximum number of streams reached") + log.Printf("rafthttp: maximum number of stream buffer entries to %d has been reached", s.to) + return fmt.Errorf("maximum number of stream buffer entries has been reached") } } @@ -170,7 +170,7 @@ func (s *streamClient) isStopped() bool { func (s *streamClient) handle(r io.Reader) { defer func() { close(s.done) - log.Printf("rafthttp: client streaming to %s at term %d is been stopped", s.to, s.term) + log.Printf("rafthttp: client streaming to %s at term %d has been stopped", s.to, s.term) }() er := &entryReader{r: r}