diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go index bfe08ea35..70b7177d3 100644 --- a/etcdserver/v3_server.go +++ b/etcdserver/v3_server.go @@ -577,12 +577,7 @@ func (s *EtcdServer) raftRequestOnce(ctx context.Context, r pb.InternalRaftReque } func (s *EtcdServer) raftRequest(ctx context.Context, r pb.InternalRaftRequest) (proto.Message, error) { - for { - resp, err := s.raftRequestOnce(ctx, r) - if err != auth.ErrAuthOldRevision { - return resp, err - } - } + return s.raftRequestOnce(ctx, r) } // doSerialize handles the auth logic, with permissions checked by "chk", for a serialized request "get". Returns a non-nil error on authentication failure. diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index 486691fe2..ee386ffa0 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -357,6 +357,7 @@ func TestV3AuthNonAuthorizedRPCs(t *testing.T) { } func TestV3AuthOldRevConcurrent(t *testing.T) { + t.Skip() // TODO(jingyih): re-enable the test when #10408 is fixed. defer testutil.AfterTest(t) clus := NewClusterV3(t, &ClusterConfig{Size: 1}) defer clus.Terminate(t)