From 5014558b004f338ee39ec3c09df75b3338772d16 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Tue, 21 Oct 2014 17:54:21 -0700 Subject: [PATCH] etcdserver: clean code --- etcdserver/cluster_store.go | 2 +- etcdserver/etcdhttp/http.go | 2 +- etcdserver/server_test.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etcdserver/cluster_store.go b/etcdserver/cluster_store.go index 67239a314..034b41354 100644 --- a/etcdserver/cluster_store.go +++ b/etcdserver/cluster_store.go @@ -126,7 +126,7 @@ func (s *clusterStore) Remove(id uint64) { log.Panicf("delete peer should never fail: %v", err) } if _, err := s.Store.Create(removedMemberStoreKey(id), false, "", false, store.Permanent); err != nil { - log.Panicf("unexpected creating removed member error: %v", err) + log.Panicf("creating RemovedMember should never fail: %v", err) } } diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go index 8e1888593..6b98ad013 100644 --- a/etcdserver/etcdhttp/http.go +++ b/etcdserver/etcdhttp/http.go @@ -242,7 +242,7 @@ func (h serverHandler) serveRaft(w http.ResponseWriter, r *http.Request) { log.Println("etcdhttp: error processing raft message:", err) switch err { case etcdserver.ErrRemoved: - http.Error(w, "unexpected message from removed node", http.StatusForbidden) + http.Error(w, "cannot process message from removed node", http.StatusForbidden) default: writeError(w, err) } diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index cf59bb4a1..6c5a10bc0 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -20,6 +20,7 @@ import ( "encoding/json" "fmt" "math/rand" + "path" "reflect" "sync" "testing" @@ -967,7 +968,7 @@ func TestPublish(t *testing.T) { t.Errorf("method = %s, want PUT", r.Method) } wm := Member{ID: 1, Attributes: Attributes{Name: "node1", ClientURLs: []string{"http://a", "http://b"}}} - if w := memberStoreKey(wm.ID) + attributesSuffix; r.Path != w { + if w := path.Join(memberStoreKey(wm.ID), attributesSuffix); r.Path != w { t.Errorf("path = %s, want %s", r.Path, w) } var gattr Attributes