Skip to content

Commit 4837a85

Browse files
authored
Merge pull request #157059 from cockroachdb/blathers/backport-release-25.4-156729
release-25.4: Add grpc connection closing error to allowlist
2 parents 86e4673 + 12f9fad commit 4837a85

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

pkg/ccl/changefeedccl/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ go_test(
339339
"//pkg/util/ctxgroup",
340340
"//pkg/util/duration",
341341
"//pkg/util/encoding",
342+
"//pkg/util/grpcutil",
342343
"//pkg/util/hlc",
343344
"//pkg/util/intsets",
344345
"//pkg/util/ioctx",

pkg/ccl/changefeedccl/helpers_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import (
5454
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
5555
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
5656
"github.com/cockroachdb/cockroach/pkg/util"
57+
"github.com/cockroachdb/cockroach/pkg/util/grpcutil"
5758
"github.com/cockroachdb/cockroach/pkg/util/hlc"
5859
"github.com/cockroachdb/cockroach/pkg/util/json"
5960
"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -941,7 +942,7 @@ func requireNoFeedsFail(t *testing.T) (fn updateKnobsFn) {
941942
`context canceled`,
942943
}
943944
shouldIgnoreErr := func(err error) bool {
944-
if err == nil || errors.Is(err, context.Canceled) {
945+
if err == nil || errors.Is(err, context.Canceled) || grpcutil.IsClosedConnection(err) {
945946
return true
946947
}
947948
for _, ignoreErr := range ignoreErrs {

0 commit comments

Comments
 (0)