From eae30a6c9becbdf34500de14353bfd3d0649faa9 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 30 Apr 2018 14:03:20 -0700 Subject: [PATCH] etcdserver: fix "unconvert" warnings Signed-off-by: Gyuho Lee --- etcdserver/api/v2http/metrics.go | 4 ++-- etcdserver/api/v2v3/store.go | 2 +- etcdserver/corrupt.go | 2 +- etcdserver/server.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etcdserver/api/v2http/metrics.go b/etcdserver/api/v2http/metrics.go index 9f93d8702..2e8998444 100644 --- a/etcdserver/api/v2http/metrics.go +++ b/etcdserver/api/v2http/metrics.go @@ -87,9 +87,9 @@ func codeFromError(err error) int { } switch e := err.(type) { case *v2error.Error: - return (*v2error.Error)(e).StatusCode() + return e.StatusCode() case *httptypes.HTTPError: - return (*httptypes.HTTPError)(e).Code + return e.Code default: return http.StatusInternalServerError } diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go index fd1dc78b3..b3da8091e 100644 --- a/etcdserver/api/v2v3/store.go +++ b/etcdserver/api/v2v3/store.go @@ -601,7 +601,7 @@ func (s *v2v3Store) mkV2Node(kv *mvccpb.KeyValue) *v2store.NodeExtern { return nil } n := &v2store.NodeExtern{ - Key: string(s.mkNodePath(string(kv.Key))), + Key: s.mkNodePath(string(kv.Key)), Dir: kv.Key[len(kv.Key)-1] == '/', CreatedIndex: mkV2Rev(kv.CreateRevision), ModifiedIndex: mkV2Rev(kv.ModRevision), diff --git a/etcdserver/corrupt.go b/etcdserver/corrupt.go index 2170121a0..5c88d355d 100644 --- a/etcdserver/corrupt.go +++ b/etcdserver/corrupt.go @@ -204,7 +204,7 @@ func (s *EtcdServer) checkHashKV() error { } alarmed = true a := &pb.AlarmRequest{ - MemberID: uint64(id), + MemberID: id, Action: pb.AlarmRequest_ACTIVATE, Alarm: pb.AlarmType_CORRUPT, } diff --git a/etcdserver/server.go b/etcdserver/server.go index 8511383af..eeb8582a1 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -2002,7 +2002,7 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange, confState *raftpb.Con lg.Panic( "got different member ID", zap.String("member-id-from-config-change-entry", types.ID(cc.NodeID).String()), - zap.String("member-id-from-message", types.ID(m.ID).String()), + zap.String("member-id-from-message", m.ID.String()), ) } else { plog.Panicf("nodeID should always be equal to member ID") @@ -2035,7 +2035,7 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange, confState *raftpb.Con lg.Panic( "got different member ID", zap.String("member-id-from-config-change-entry", types.ID(cc.NodeID).String()), - zap.String("member-id-from-message", types.ID(m.ID).String()), + zap.String("member-id-from-message", m.ID.String()), ) } else { plog.Panicf("nodeID should always be equal to member ID")