Skip to content

Commit 532a0fe

Browse files
loqrecovery: enable DRPC for loqrecovery tests randomly
Previously, loqrecovery tests would fail when DRPC was enabled because DRPC returns codes.Unknown for connection errors, while gRPC returns codes.Unavailable. DRPC version used in this patch has a fix to return codes.Unavailable for connection errors. Fixes: #159372 Epic: CRDB-55382 Release note: None
1 parent 843d488 commit 532a0fe

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

DEPS.bzl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10960,11 +10960,10 @@ def go_deps():
1096010960
name = "io_storj_drpc",
1096110961
build_file_proto_mode = "disable_global",
1096210962
importpath = "storj.io/drpc",
10963-
sha256 = "f7e8b2536ebc8807b56e62b7a9bd622a5265cb44b8f689473e36f8daf20248a3",
10964-
strip_prefix = "github.com/cockroachdb/drpc@v0.0.0-20251210103241-07114ac1c731",
10965-
urls = [
10966-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20251210103241-07114ac1c731.zip",
10967-
],
10963+
replace = "github.com/cthumuluru-crdb/drpc",
10964+
# TODO: mirror this repo (to fix, run `./dev generate bazel --mirror`)
10965+
sum = "h1:TJWMOPkajyPg/cZnBP3QoZkePaukhJv5xmvSBJNybLY=",
10966+
version = "v0.0.0-20260105064258-02c427034629",
1096810967
)
1096910968
go_repository(
1097010969
name = "org_bazil_fuse",

build/bazelutil/distdir_files.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ DISTDIR_FILES = {
346346
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlfmt/com_github_cockroachdb_crlfmt-v0.0.0-20221214225007-b2fc5c302548.zip": "fedc01bdd6d964da0425d5eaac8efadc951e78e13f102292cc0774197f09ab63",
347347
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20251122031428-fe658a2dbda1.zip": "fa361e52b072ce18ac1d103e2556851906477361b5fe688745d29b1efabff3cb",
348348
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/datadriven/com_github_cockroachdb_datadriven-v1.0.3-0.20251123150250-ddff6747b112.zip": "6c1ae8a9550d3a92f85d7371e5c0caf922dc0ff1425e299359814b6a9a587f14",
349-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20251210103241-07114ac1c731.zip": "f7e8b2536ebc8807b56e62b7a9bd622a5265cb44b8f689473e36f8daf20248a3",
350349
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/errors/com_github_cockroachdb_errors-v1.12.1-0.20251010171200-64801262cd6f.zip": "4df66cc44791d4290071696abf179dc6df7b94b4cb5d29a20f39c6bf522c60ee",
351350
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
352351
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gogoproto/com_github_cockroachdb_gogoproto-v1.3.3-0.20241216150617-2358cdb156a1.zip": "bf052c9a7f9e23fb3ec7e9f3b7201cfc264c18ed6da0d662952d276dbc339003",

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,8 @@ replace github.com/docker/docker => github.com/moby/moby v24.0.6+incompatible
548548

549549
replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.3.3-0.20241216150617-2358cdb156a1
550550

551-
replace storj.io/drpc => github.com/cockroachdb/drpc v0.0.0-20251210103241-07114ac1c731
551+
// replace storj.io/drpc => github.com/cockroachdb/drpc v0.0.0-20251210103241-07114ac1c731
552+
replace storj.io/drpc => github.com/cthumuluru-crdb/drpc v0.0.0-20260105064258-02c427034629
552553

553554
// Note: This forked dependency adds a commit that opens up some
554555
// private APIs to enable us to make some perf improvements to

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,6 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
564564
github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
565565
github.com/cockroachdb/datadriven v1.0.3-0.20251123150250-ddff6747b112 h1:T1++5Vt0/4/IWZ1mHmUYl7fhQnz50QhNWIY+ITvLLIM=
566566
github.com/cockroachdb/datadriven v1.0.3-0.20251123150250-ddff6747b112/go.mod h1:jsaKMvD3RBCATk1/jbUZM8C9idWBJME9+VRZ5+Liq1g=
567-
github.com/cockroachdb/drpc v0.0.0-20251210103241-07114ac1c731 h1:wCv7ywrOhlUYIoG7ghTZFLEB2QdDMS73f6+V7TJgc1c=
568-
github.com/cockroachdb/drpc v0.0.0-20251210103241-07114ac1c731/go.mod h1:Ag2/Yfl22WZ8ywFUasRQ2brdltpX5QvY63jnYTZ3N5U=
569567
github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f h1:lUmJxzb2/ukuRIvKTaNkvuj5LwlX4u/KxnI3zmx1SSw=
570568
github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f/go.mod h1:SvzfYNNBshAVbZ8wzNc/UPK3w1vf0dKDUP41ucAIf7g=
571569
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 h1:YqzBA7tf8Gv8Oz0BbBsPenqkyjiohS7EUIwi7p1QJCU=
@@ -721,6 +719,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
721719
github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
722720
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
723721
github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ=
722+
github.com/cthumuluru-crdb/drpc v0.0.0-20260105064258-02c427034629 h1:TJWMOPkajyPg/cZnBP3QoZkePaukhJv5xmvSBJNybLY=
723+
github.com/cthumuluru-crdb/drpc v0.0.0-20260105064258-02c427034629/go.mod h1:Ag2/Yfl22WZ8ywFUasRQ2brdltpX5QvY63jnYTZ3N5U=
724724
github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
725725
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
726726
github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=

pkg/kv/kvserver/loqrecovery/server_integration_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,9 @@ func prepTestCluster(
743743
lReg := listenerutil.NewListenerRegistry()
744744

745745
args := base.TestClusterArgs{
746+
ServerArgs: base.TestServerArgs{
747+
DefaultDRPCOption: base.TestDRPCEnabledRandomly,
748+
},
746749
ServerArgsPerNode: make(map[int]base.TestServerArgs),
747750
ReusableListenerReg: lReg,
748751
}

0 commit comments

Comments
 (0)