Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: fix "unconvert" warnings

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-30 14:03:20 -07:00
parent 8a28e73862
commit eae30a6c9b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/api/v2http/metrics.go
View File

@ -87,9 +87,9 @@ func codeFromError(err error) int {
} }
switch e := err.(type) { switch e := err.(type) {
case *v2error.Error: case *v2error.Error:
return (*v2error.Error)(e).StatusCode() return e.StatusCode()
case *httptypes.HTTPError: case *httptypes.HTTPError:
return (*httptypes.HTTPError)(e).Code return e.Code
default: default:
return http.StatusInternalServerError return http.StatusInternalServerError
} }

2
etcdserver/api/v2v3/store.go
View File

@ -601,7 +601,7 @@ func (s *v2v3Store) mkV2Node(kv *mvccpb.KeyValue) *v2store.NodeExtern {
return nil return nil
} }
n := &v2store.NodeExtern{ n := &v2store.NodeExtern{
Key: string(s.mkNodePath(string(kv.Key))), Key: s.mkNodePath(string(kv.Key)),
Dir: kv.Key[len(kv.Key)-1] == '/', Dir: kv.Key[len(kv.Key)-1] == '/',
CreatedIndex: mkV2Rev(kv.CreateRevision), CreatedIndex: mkV2Rev(kv.CreateRevision),
ModifiedIndex: mkV2Rev(kv.ModRevision), ModifiedIndex: mkV2Rev(kv.ModRevision),

2
etcdserver/corrupt.go
View File

@ -204,7 +204,7 @@ func (s *EtcdServer) checkHashKV() error {
} }
alarmed = true alarmed = true
a := &pb.AlarmRequest{ a := &pb.AlarmRequest{
MemberID: uint64(id), MemberID: id,
Action: pb.AlarmRequest_ACTIVATE, Action: pb.AlarmRequest_ACTIVATE,
Alarm: pb.AlarmType_CORRUPT, Alarm: pb.AlarmType_CORRUPT,
} }

4
etcdserver/server.go
View File

@ -2002,7 +2002,7 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange, confState *raftpb.Con
lg.Panic( lg.Panic(
"got different member ID", "got different member ID",
zap.String("member-id-from-config-change-entry", types.ID(cc.NodeID).String()), 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 { } else {
plog.Panicf("nodeID should always be equal to member ID") 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( lg.Panic(
"got different member ID", "got different member ID",
zap.String("member-id-from-config-change-entry", types.ID(cc.NodeID).String()), 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 { } else {
plog.Panicf("nodeID should always be equal to member ID") plog.Panicf("nodeID should always be equal to member ID")