mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00

This commit adds a mechanism of handling a case of expired auth token to clientv3. If a server returns an error code grpc.codes.Unauthenticated, newRetryWrapper() tries to get a new token and use it as an option of PerRPCCredential. Fixes https://github.com/coreos/etcd/issues/7012
294 lines
9.7 KiB
Go
294 lines
9.7 KiB
Go
// Copyright 2016 The etcd Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package clientv3
|
|
|
|
import (
|
|
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
|
"golang.org/x/net/context"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/codes"
|
|
)
|
|
|
|
type rpcFunc func(ctx context.Context) error
|
|
type retryRpcFunc func(context.Context, rpcFunc) error
|
|
|
|
func (c *Client) newRetryWrapper() retryRpcFunc {
|
|
return func(rpcCtx context.Context, f rpcFunc) error {
|
|
for {
|
|
err := f(rpcCtx)
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
|
|
eErr := rpctypes.Error(err)
|
|
// always stop retry on etcd errors
|
|
if _, ok := eErr.(rpctypes.EtcdError); ok {
|
|
return err
|
|
}
|
|
|
|
// only retry if unavailable
|
|
if grpc.Code(err) != codes.Unavailable {
|
|
return err
|
|
}
|
|
|
|
select {
|
|
case <-c.balancer.ConnectNotify():
|
|
case <-rpcCtx.Done():
|
|
return rpcCtx.Err()
|
|
case <-c.ctx.Done():
|
|
return c.ctx.Err()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *Client) newAuthRetryWrapper() retryRpcFunc {
|
|
return func(rpcCtx context.Context, f rpcFunc) error {
|
|
for {
|
|
err := f(rpcCtx)
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
|
|
// always stop retry on etcd errors other than invalid auth token
|
|
if rpctypes.Error(err) == rpctypes.ErrInvalidAuthToken {
|
|
gterr := c.getToken(rpcCtx)
|
|
if gterr != nil {
|
|
return err // return the original error for simplicity
|
|
}
|
|
continue
|
|
}
|
|
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
// RetryKVClient implements a KVClient that uses the client's FailFast retry policy.
|
|
func RetryKVClient(c *Client) pb.KVClient {
|
|
retryWrite := &retryWriteKVClient{pb.NewKVClient(c.conn), c.retryWrapper}
|
|
return &retryKVClient{&retryWriteKVClient{retryWrite, c.retryAuthWrapper}}
|
|
}
|
|
|
|
type retryKVClient struct {
|
|
*retryWriteKVClient
|
|
}
|
|
|
|
func (rkv *retryKVClient) Range(ctx context.Context, in *pb.RangeRequest, opts ...grpc.CallOption) (resp *pb.RangeResponse, err error) {
|
|
err = rkv.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rkv.retryWriteKVClient.Range(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
type retryWriteKVClient struct {
|
|
pb.KVClient
|
|
retryf retryRpcFunc
|
|
}
|
|
|
|
func (rkv *retryWriteKVClient) Put(ctx context.Context, in *pb.PutRequest, opts ...grpc.CallOption) (resp *pb.PutResponse, err error) {
|
|
err = rkv.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rkv.KVClient.Put(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rkv *retryWriteKVClient) DeleteRange(ctx context.Context, in *pb.DeleteRangeRequest, opts ...grpc.CallOption) (resp *pb.DeleteRangeResponse, err error) {
|
|
err = rkv.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rkv.KVClient.DeleteRange(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rkv *retryWriteKVClient) Txn(ctx context.Context, in *pb.TxnRequest, opts ...grpc.CallOption) (resp *pb.TxnResponse, err error) {
|
|
err = rkv.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rkv.KVClient.Txn(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rkv *retryWriteKVClient) Compact(ctx context.Context, in *pb.CompactionRequest, opts ...grpc.CallOption) (resp *pb.CompactionResponse, err error) {
|
|
err = rkv.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rkv.KVClient.Compact(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
type retryLeaseClient struct {
|
|
pb.LeaseClient
|
|
retryf retryRpcFunc
|
|
}
|
|
|
|
// RetryLeaseClient implements a LeaseClient that uses the client's FailFast retry policy.
|
|
func RetryLeaseClient(c *Client) pb.LeaseClient {
|
|
retry := &retryLeaseClient{pb.NewLeaseClient(c.conn), c.retryWrapper}
|
|
return &retryLeaseClient{retry, c.retryAuthWrapper}
|
|
}
|
|
|
|
func (rlc *retryLeaseClient) LeaseGrant(ctx context.Context, in *pb.LeaseGrantRequest, opts ...grpc.CallOption) (resp *pb.LeaseGrantResponse, err error) {
|
|
err = rlc.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rlc.LeaseClient.LeaseGrant(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
|
|
}
|
|
|
|
func (rlc *retryLeaseClient) LeaseRevoke(ctx context.Context, in *pb.LeaseRevokeRequest, opts ...grpc.CallOption) (resp *pb.LeaseRevokeResponse, err error) {
|
|
err = rlc.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rlc.LeaseClient.LeaseRevoke(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
type retryClusterClient struct {
|
|
pb.ClusterClient
|
|
retryf retryRpcFunc
|
|
}
|
|
|
|
// RetryClusterClient implements a ClusterClient that uses the client's FailFast retry policy.
|
|
func RetryClusterClient(c *Client) pb.ClusterClient {
|
|
return &retryClusterClient{pb.NewClusterClient(c.conn), c.retryWrapper}
|
|
}
|
|
|
|
func (rcc *retryClusterClient) MemberAdd(ctx context.Context, in *pb.MemberAddRequest, opts ...grpc.CallOption) (resp *pb.MemberAddResponse, err error) {
|
|
err = rcc.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rcc.ClusterClient.MemberAdd(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rcc *retryClusterClient) MemberRemove(ctx context.Context, in *pb.MemberRemoveRequest, opts ...grpc.CallOption) (resp *pb.MemberRemoveResponse, err error) {
|
|
err = rcc.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rcc.ClusterClient.MemberRemove(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rcc *retryClusterClient) MemberUpdate(ctx context.Context, in *pb.MemberUpdateRequest, opts ...grpc.CallOption) (resp *pb.MemberUpdateResponse, err error) {
|
|
err = rcc.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rcc.ClusterClient.MemberUpdate(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
type retryAuthClient struct {
|
|
pb.AuthClient
|
|
retryf retryRpcFunc
|
|
}
|
|
|
|
// RetryAuthClient implements a AuthClient that uses the client's FailFast retry policy.
|
|
func RetryAuthClient(c *Client) pb.AuthClient {
|
|
return &retryAuthClient{pb.NewAuthClient(c.conn), c.retryWrapper}
|
|
}
|
|
|
|
func (rac *retryAuthClient) AuthEnable(ctx context.Context, in *pb.AuthEnableRequest, opts ...grpc.CallOption) (resp *pb.AuthEnableResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.AuthEnable(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) AuthDisable(ctx context.Context, in *pb.AuthDisableRequest, opts ...grpc.CallOption) (resp *pb.AuthDisableResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.AuthDisable(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) UserAdd(ctx context.Context, in *pb.AuthUserAddRequest, opts ...grpc.CallOption) (resp *pb.AuthUserAddResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.UserAdd(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) UserDelete(ctx context.Context, in *pb.AuthUserDeleteRequest, opts ...grpc.CallOption) (resp *pb.AuthUserDeleteResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.UserDelete(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) UserChangePassword(ctx context.Context, in *pb.AuthUserChangePasswordRequest, opts ...grpc.CallOption) (resp *pb.AuthUserChangePasswordResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.UserChangePassword(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) UserGrantRole(ctx context.Context, in *pb.AuthUserGrantRoleRequest, opts ...grpc.CallOption) (resp *pb.AuthUserGrantRoleResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.UserGrantRole(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) UserRevokeRole(ctx context.Context, in *pb.AuthUserRevokeRoleRequest, opts ...grpc.CallOption) (resp *pb.AuthUserRevokeRoleResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.UserRevokeRole(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) RoleAdd(ctx context.Context, in *pb.AuthRoleAddRequest, opts ...grpc.CallOption) (resp *pb.AuthRoleAddResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.RoleAdd(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) RoleDelete(ctx context.Context, in *pb.AuthRoleDeleteRequest, opts ...grpc.CallOption) (resp *pb.AuthRoleDeleteResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.RoleDelete(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) RoleGrantPermission(ctx context.Context, in *pb.AuthRoleGrantPermissionRequest, opts ...grpc.CallOption) (resp *pb.AuthRoleGrantPermissionResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.RoleGrantPermission(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|
|
|
|
func (rac *retryAuthClient) RoleRevokePermission(ctx context.Context, in *pb.AuthRoleRevokePermissionRequest, opts ...grpc.CallOption) (resp *pb.AuthRoleRevokePermissionResponse, err error) {
|
|
err = rac.retryf(ctx, func(rctx context.Context) error {
|
|
resp, err = rac.AuthClient.RoleRevokePermission(rctx, in, opts...)
|
|
return err
|
|
})
|
|
return resp, err
|
|
}
|