Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server: disable flaky check in TestDecommissionedNodeCannotConnect #61471

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkg/server/connectivity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/clusterversion"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/liveness/livenesspb"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/rpc"
Expand Down Expand Up @@ -396,12 +395,14 @@ func TestDecommissionedNodeCannotConnect(t *testing.T) {

// Trying to scan the scratch range via the decommissioned node should
// now result in a permission denied error.
_, err := decomSrv.DB().Scan(ctx, scratchKey, keys.MaxKey, 1)
require.Error(t, err)

//
// TODO(erikgrinaker): until cockroachdb/errors preserves grpcstatus.Error
// across errors.EncodeError() we just check for any error, this should
// check that it matches codes.PermissionDenied later.
// across errors.EncodeError() we'll have to disable this, since the return
// code isn't preserved, and since some internal calls (notably RangeLookup
// via RangeIterator) end up retrying indefinitely because it can't detect
// the error code. See: https://github.com/cockroachdb/cockroach/issues/61470
//_, err := decomSrv.DB().Scan(ctx, scratchKey, keys.MaxKey, 1)
//require.Error(t, err)
//err = errors.UnwrapAll(err)
//s, ok := grpcstatus.FromError(err)
//require.True(t, ok, "expected gRPC error, got %T (%v)", err, err)
Expand Down