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

server/etcdserver: togRPCError for maintenance API

Browse Source 
It's to deflake TestAuthMemberRemove.

When the client has multiple endpoints, the client might send a request
with valid token to the follower member which hasn't received token
replicated log yet. The member will reject the request.

For instance, the maintenance.Status API will return "auth: invalid auth
token". But the client doesn't identify the error. The client won't retry to
refresh auth token. The maintenance.Status should togRPCError before return
so that the client can reflesh token. It's align with existing API.

Since the maintenance client always creates one connection to target
member, the member will have the token after refresh auth.

Maybe we can introduce a sync to wait for member is ready with token,
instead of refreshing.

Fixes: #15758

Signed-off-by: Wei Fu <fuweid89@gmail.com>
This commit is contained in:
Wei Fu 2023-04-22 16:35:28 +08:00
parent 63c9fe1d00
commit 1ba577e499
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/etcdserver/api/v3rpc/maintenance.go
View File

@ -90,7 +90,7 @@ func (ms *maintenanceServer) Defragment(ctx context.Context, sr *pb.DefragmentRe
err := ms.bg.Backend().Defrag() err := ms.bg.Backend().Defrag()
if err != nil { if err != nil {
ms.lg.Warn("failed to defragment", zap.Error(err)) ms.lg.Warn("failed to defragment", zap.Error(err))
return nil, err return nil, togRPCError(err)
} }
ms.lg.Info("finished defragment") ms.lg.Info("finished defragment")
return &pb.DefragmentResponse{}, nil return &pb.DefragmentResponse{}, nil
@ -279,7 +279,7 @@ type authMaintenanceServer struct {
func (ams *authMaintenanceServer) Defragment(ctx context.Context, sr *pb.DefragmentRequest) (*pb.DefragmentResponse, error) { func (ams *authMaintenanceServer) Defragment(ctx context.Context, sr *pb.DefragmentRequest) (*pb.DefragmentResponse, error) {
if err := ams.isPermitted(ctx); err != nil { if err := ams.isPermitted(ctx); err != nil {
return nil, err return nil, togRPCError(err)
} }
return ams.maintenanceServer.Defragment(ctx, sr) return ams.maintenanceServer.Defragment(ctx, sr)
@ -287,7 +287,7 @@ func (ams *authMaintenanceServer) Defragment(ctx context.Context, sr *pb.Defragm
func (ams *authMaintenanceServer) Snapshot(sr *pb.SnapshotRequest, srv pb.Maintenance_SnapshotServer) error { func (ams *authMaintenanceServer) Snapshot(sr *pb.SnapshotRequest, srv pb.Maintenance_SnapshotServer) error {
if err := ams.isPermitted(srv.Context()); err != nil { if err := ams.isPermitted(srv.Context()); err != nil {
return err return togRPCError(err)
} }
return ams.maintenanceServer.Snapshot(sr, srv) return ams.maintenanceServer.Snapshot(sr, srv)
@ -295,7 +295,7 @@ func (ams *authMaintenanceServer) Snapshot(sr *pb.SnapshotRequest, srv pb.Mainte
func (ams *authMaintenanceServer) Hash(ctx context.Context, r *pb.HashRequest) (*pb.HashResponse, error) { func (ams *authMaintenanceServer) Hash(ctx context.Context, r *pb.HashRequest) (*pb.HashResponse, error) {
if err := ams.isPermitted(ctx); err != nil { if err := ams.isPermitted(ctx); err != nil {
return nil, err return nil, togRPCError(err)
} }
return ams.maintenanceServer.Hash(ctx, r) return ams.maintenanceServer.Hash(ctx, r)
@ -303,14 +303,14 @@ func (ams *authMaintenanceServer) Hash(ctx context.Context, r *pb.HashRequest) (
func (ams *authMaintenanceServer) HashKV(ctx context.Context, r *pb.HashKVRequest) (*pb.HashKVResponse, error) { func (ams *authMaintenanceServer) HashKV(ctx context.Context, r *pb.HashKVRequest) (*pb.HashKVResponse, error) {
if err := ams.isPermitted(ctx); err != nil { if err := ams.isPermitted(ctx); err != nil {
return nil, err return nil, togRPCError(err)
} }
return ams.maintenanceServer.HashKV(ctx, r) return ams.maintenanceServer.HashKV(ctx, r)
} }
func (ams *authMaintenanceServer) Status(ctx context.Context, ar *pb.StatusRequest) (*pb.StatusResponse, error) { func (ams *authMaintenanceServer) Status(ctx context.Context, ar *pb.StatusRequest) (*pb.StatusResponse, error) {
if err := ams.isPermitted(ctx); err != nil { if err := ams.isPermitted(ctx); err != nil {
return nil, err return nil, togRPCError(err)
} }
return ams.maintenanceServer.Status(ctx, ar) return ams.maintenanceServer.Status(ctx, ar)
@ -318,7 +318,7 @@ func (ams *authMaintenanceServer) Status(ctx context.Context, ar *pb.StatusReque
func (ams *authMaintenanceServer) MoveLeader(ctx context.Context, tr *pb.MoveLeaderRequest) (*pb.MoveLeaderResponse, error) { func (ams *authMaintenanceServer) MoveLeader(ctx context.Context, tr *pb.MoveLeaderRequest) (*pb.MoveLeaderResponse, error) {
if err := ams.isPermitted(ctx); err != nil { if err := ams.isPermitted(ctx); err != nil {
return nil, err return nil, togRPCError(err)
} }
return ams.maintenanceServer.MoveLeader(ctx, tr) return ams.maintenanceServer.MoveLeader(ctx, tr)
@ -326,7 +326,7 @@ func (ams *authMaintenanceServer) MoveLeader(ctx context.Context, tr *pb.MoveLea
func (ams *authMaintenanceServer) Downgrade(ctx context.Context, r *pb.DowngradeRequest) (*pb.DowngradeResponse, error) { func (ams *authMaintenanceServer) Downgrade(ctx context.Context, r *pb.DowngradeRequest) (*pb.DowngradeResponse, error) {
if err := ams.isPermitted(ctx); err != nil { if err := ams.isPermitted(ctx); err != nil {
return nil, err return nil, togRPCError(err)
} }
return ams.maintenanceServer.Downgrade(ctx, r) return ams.maintenanceServer.Downgrade(ctx, r)