From 12f9fad77cbad45432d7ad2cb6decfbdc4623395 Mon Sep 17 00:00:00 2001 From: shanky Date: Sun, 2 Nov 2025 07:15:45 +0000 Subject: [PATCH] Use grpcutil.IsClosedConnection for error handling --- pkg/ccl/changefeedccl/BUILD.bazel | 1 + pkg/ccl/changefeedccl/helpers_test.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/ccl/changefeedccl/BUILD.bazel b/pkg/ccl/changefeedccl/BUILD.bazel index fbe8a4b27ba2..bf7f921a7ad8 100644 --- a/pkg/ccl/changefeedccl/BUILD.bazel +++ b/pkg/ccl/changefeedccl/BUILD.bazel @@ -339,6 +339,7 @@ go_test( "//pkg/util/ctxgroup", "//pkg/util/duration", "//pkg/util/encoding", + "//pkg/util/grpcutil", "//pkg/util/hlc", "//pkg/util/intsets", "//pkg/util/ioctx", diff --git a/pkg/ccl/changefeedccl/helpers_test.go b/pkg/ccl/changefeedccl/helpers_test.go index 0ab6b249b33f..b21664222e74 100644 --- a/pkg/ccl/changefeedccl/helpers_test.go +++ b/pkg/ccl/changefeedccl/helpers_test.go @@ -54,6 +54,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util" + "github.com/cockroachdb/cockroach/pkg/util/grpcutil" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/json" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -941,7 +942,7 @@ func requireNoFeedsFail(t *testing.T) (fn updateKnobsFn) { `context canceled`, } shouldIgnoreErr := func(err error) bool { - if err == nil || errors.Is(err, context.Canceled) { + if err == nil || errors.Is(err, context.Canceled) || grpcutil.IsClosedConnection(err) { return true } for _, ignoreErr := range ignoreErrs {