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

learner support snapshot RPC (#12890)

Browse Source 
* learner support snapshot RPC

* CHANGELOG: update for 12890
This commit is contained in:
tangcong
2021-05-05 04:26:33 +08:00
committed by GitHub
parent a3fc535a5a
commit b32bc914ff
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-3.5.md
View File

@ -239,6 +239,7 @@ Note that any `etcd_debugging_*` metrics are experimental and subject to change.
- Add [`/v3/auth/status`](https://github.com/etcd-io/etcd/pull/11536) endpoint to check if authentication is enabled - Add [`/v3/auth/status`](https://github.com/etcd-io/etcd/pull/11536) endpoint to check if authentication is enabled
- [Add `Linearizable` field to `etcdserverpb.MemberListRequest`](https://github.com/etcd-io/etcd/pull/11639). - [Add `Linearizable` field to `etcdserverpb.MemberListRequest`](https://github.com/etcd-io/etcd/pull/11639).
- [Learner support Snapshot RPC](https://github.com/etcd-io/etcd/pull/12890/).
### Package `netutil` ### Package `netutil`

3
server/etcdserver/api/v3rpc/interceptor.go
View File

@ -35,6 +35,7 @@ import (
const ( const (
maxNoLeaderCnt = 3 maxNoLeaderCnt = 3
warnUnaryRequestLatency = 300 * time.Millisecond warnUnaryRequestLatency = 300 * time.Millisecond
snapshotMethod = "/etcdserverpb.Maintenance/Snapshot"
) )
type streamsMap struct { type streamsMap struct {
@ -214,7 +215,7 @@ func newStreamInterceptor(s *etcdserver.EtcdServer) grpc.StreamServerInterceptor
return rpctypes.ErrGRPCNotCapable return rpctypes.ErrGRPCNotCapable
} }
if s.IsMemberExist(s.ID()) && s.IsLearner() { // learner does not support stream RPC if s.IsMemberExist(s.ID()) && s.IsLearner() && info.FullMethod != snapshotMethod { // learner does not support stream RPC except Snapshot
return rpctypes.ErrGPRCNotSupportedForLearner return rpctypes.ErrGPRCNotSupportedForLearner
} }