mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcdserver: check IsMemberExist before IsLearner

Browse Source 
If member does not exist in cluster, IsLearner will panic.
This commit is contained in:
Jingyi Hu
2019-04-25 16:31:22 -07:00
parent d0c1b3fa38
commit c438f6db27
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/api/v3rpc/interceptor.go
View File

@ -48,7 +48,7 @@ func newUnaryInterceptor(s *etcdserver.EtcdServer) grpc.UnaryServerInterceptor {
return nil, rpctypes.ErrGRPCNotCapable return nil, rpctypes.ErrGRPCNotCapable
} }
if s.IsLearner() && !isRPCSupportedForLearner(req) { if s.IsMemberExist(s.ID()) && s.IsLearner() && !isRPCSupportedForLearner(req) {
return nil, rpctypes.ErrGPRCNotSupportedForLearner return nil, rpctypes.ErrGPRCNotSupportedForLearner
} }
@ -194,7 +194,7 @@ func newStreamInterceptor(s *etcdserver.EtcdServer) grpc.StreamServerInterceptor
return rpctypes.ErrGRPCNotCapable return rpctypes.ErrGRPCNotCapable
} }
if s.IsLearner() { // learner does not support Watch and LeaseKeepAlive RPC if s.IsMemberExist(s.ID()) && s.IsLearner() { // learner does not support stream RPC
return rpctypes.ErrGPRCNotSupportedForLearner return rpctypes.ErrGPRCNotSupportedForLearner
} }

5
etcdserver/server.go
View File

@ -2518,3 +2518,8 @@ func (s *EtcdServer) Logger() *zap.Logger {
func (s *EtcdServer) IsLearner() bool { func (s *EtcdServer) IsLearner() bool {
return s.cluster.IsLocalMemberLearner() return s.cluster.IsLocalMemberLearner()
} }
// IsMemberExist returns if the member with the given id exists in cluster.
func (s *EtcdServer) IsMemberExist(id types.ID) bool {
return s.cluster.IsMemberExist(id)
}