Skip to content

Commit fb15a49

Browse files
*: move rpc connection_class to rpcbase package
Moving `connection_class` to the `rpcbase` package prevents cyclic dependencies with the `DRPC` integration. Epic: CRDB-48923 Informs: #147757 Release note: none
1 parent 3868fb3 commit fb15a49

File tree

89 files changed

+397
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+397
-310
lines changed

pkg/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,6 +1706,8 @@ GO_TARGETS = [
17061706
"//pkg/roachprod:roachprod_test",
17071707
"//pkg/rpc/nodedialer:nodedialer",
17081708
"//pkg/rpc/nodedialer:nodedialer_test",
1709+
"//pkg/rpc/rpcbase:base",
1710+
"//pkg/rpc/rpcbase:rpcbase",
17091711
"//pkg/rpc/rpcpb:rpcpb",
17101712
"//pkg/rpc:rpc",
17111713
"//pkg/rpc:rpc_test",

pkg/blobs/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ go_library(
1515
"//pkg/base",
1616
"//pkg/blobs/blobspb",
1717
"//pkg/roachpb",
18-
"//pkg/rpc",
1918
"//pkg/rpc/nodedialer",
19+
"//pkg/rpc/rpcbase",
2020
"//pkg/util/fileutil",
2121
"//pkg/util/grpcutil",
2222
"//pkg/util/ioctx",

pkg/blobs/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/cockroachdb/cockroach/pkg/base"
1313
"github.com/cockroachdb/cockroach/pkg/blobs/blobspb"
1414
"github.com/cockroachdb/cockroach/pkg/roachpb"
15-
"github.com/cockroachdb/cockroach/pkg/rpc"
1615
"github.com/cockroachdb/cockroach/pkg/rpc/nodedialer"
16+
"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
1717
"github.com/cockroachdb/cockroach/pkg/util/ioctx"
1818
"github.com/cockroachdb/errors"
1919
"google.golang.org/grpc/metadata"
@@ -200,7 +200,7 @@ func NewBlobClientFactory(
200200
if localNodeID == dialTarget && allowLocalFastpath {
201201
return NewLocalClient(externalIODir)
202202
}
203-
conn, err := dialer.Dial(ctx, dialTarget, rpc.DefaultClass)
203+
conn, err := dialer.Dial(ctx, dialTarget, rpcbase.DefaultClass)
204204
if err != nil {
205205
return nil, errors.Wrapf(err, "connecting to node %d", dialTarget)
206206
}

pkg/ccl/changefeedccl/kvfeed/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ go_library(
2222
"//pkg/kv/kvclient/kvcoord",
2323
"//pkg/kv/kvpb",
2424
"//pkg/roachpb",
25-
"//pkg/rpc",
25+
"//pkg/rpc/rpcbase",
2626
"//pkg/settings",
2727
"//pkg/settings/cluster",
2828
"//pkg/sql/covering",

pkg/ccl/changefeedccl/kvfeed/scanner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord"
1919
"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
2020
"github.com/cockroachdb/cockroach/pkg/roachpb"
21-
"github.com/cockroachdb/cockroach/pkg/rpc"
21+
"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
2222
"github.com/cockroachdb/cockroach/pkg/settings"
2323
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
2424
"github.com/cockroachdb/cockroach/pkg/sql/covering"
@@ -196,7 +196,7 @@ func (p *scanRequestScanner) exportSpan(
196196
r := kvpb.NewScan(remaining.Key, remaining.EndKey).(*kvpb.ScanRequest)
197197
r.ScanFormat = kvpb.BATCH_RESPONSE
198198
b.Header.TargetBytes = targetBytesPerScan
199-
b.Header.ConnectionClass = rpc.RangefeedClass
199+
b.Header.ConnectionClass = rpcbase.RangefeedClass
200200
b.AdmissionHeader = kvpb.AdmissionHeader{
201201
// TODO(irfansharif): Make this configurable if we want system table
202202
// scanners or support "high priority" changefeeds to run at higher

pkg/ccl/multiregionccl/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ go_test(
6565
"//pkg/kv/kvserver/closedts/ctpb",
6666
"//pkg/roachpb",
6767
"//pkg/rpc",
68+
"//pkg/rpc/rpcbase",
6869
"//pkg/security/securityassets",
6970
"//pkg/security/securitytest",
7071
"//pkg/server",

pkg/ccl/multiregionccl/cold_start_latency_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/cockroachdb/cockroach/pkg/keys"
1919
"github.com/cockroachdb/cockroach/pkg/roachpb"
2020
"github.com/cockroachdb/cockroach/pkg/rpc"
21+
"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
2122
"github.com/cockroachdb/cockroach/pkg/server"
2223
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
2324
"github.com/cockroachdb/cockroach/pkg/spanconfig"
@@ -86,7 +87,7 @@ func TestColdStartLatency(t *testing.T) {
8687
InjectedLatencyOracle: regionlatency.MakeAddrMap(),
8788
InjectedLatencyEnabled: latencyEnabled.Load,
8889
UnaryClientInterceptor: func(
89-
target string, class rpc.ConnectionClass,
90+
target string, class rpcbase.ConnectionClass,
9091
) grpc.UnaryClientInterceptor {
9192
return func(
9293
ctx context.Context, method string, req, reply interface{},
@@ -200,7 +201,7 @@ COMMIT;`}
200201
InjectedLatencyOracle,
201202
InjectedLatencyEnabled: latencyEnabled.Load,
202203
StreamClientInterceptor: func(
203-
target string, class rpc.ConnectionClass,
204+
target string, class rpcbase.ConnectionClass,
204205
) grpc.StreamClientInterceptor {
205206
return func(
206207
ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn,
@@ -231,7 +232,7 @@ COMMIT;`}
231232
}, nil
232233
}
233234
},
234-
UnaryClientInterceptor: func(target string, class rpc.ConnectionClass) grpc.UnaryClientInterceptor {
235+
UnaryClientInterceptor: func(target string, class rpcbase.ConnectionClass) grpc.UnaryClientInterceptor {
235236
var nodeID int
236237
if nodeIDPtr, ok := addrsToNodeIDs.Load(target); ok {
237238
nodeID = *nodeIDPtr

pkg/ccl/serverccl/statusccl/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ go_test(
1919
"//pkg/keys",
2020
"//pkg/kv/kvserver",
2121
"//pkg/roachpb",
22-
"//pkg/rpc",
22+
"//pkg/rpc/rpcbase",
2323
"//pkg/security/securityassets",
2424
"//pkg/security/securitytest",
2525
"//pkg/server",

pkg/ccl/serverccl/statusccl/tenant_grpc_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/cockroachdb/cockroach/pkg/base"
1414
"github.com/cockroachdb/cockroach/pkg/roachpb"
15-
"github.com/cockroachdb/cockroach/pkg/rpc"
15+
"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
1616
"github.com/cockroachdb/cockroach/pkg/server/serverpb"
1717
"github.com/cockroachdb/cockroach/pkg/sql/sqlstats"
1818
"github.com/cockroachdb/cockroach/pkg/sql/sqlstats/persistedsqlstats/sqlstatstestutil"
@@ -132,7 +132,7 @@ func TestTenantGRPCServices(t *testing.T) {
132132
rpcCtx := tenant2.RPCContext()
133133

134134
nodeID := roachpb.NodeID(tenant.SQLInstanceID())
135-
conn, err := rpcCtx.GRPCDialNode(grpcAddr, nodeID, roachpb.Locality{}, rpc.DefaultClass).Connect(ctx)
135+
conn, err := rpcCtx.GRPCDialNode(grpcAddr, nodeID, roachpb.Locality{}, rpcbase.DefaultClass).Connect(ctx)
136136
require.NoError(t, err)
137137

138138
client := serverpb.NewStatusClient(conn)
@@ -146,7 +146,7 @@ func TestTenantGRPCServices(t *testing.T) {
146146
grpcAddr := server.RPCAddr()
147147
rpcCtx := tenant.RPCContext()
148148

149-
conn, err := rpcCtx.GRPCDialNode(grpcAddr, server.NodeID(), roachpb.Locality{}, rpc.DefaultClass).Connect(ctx)
149+
conn, err := rpcCtx.GRPCDialNode(grpcAddr, server.NodeID(), roachpb.Locality{}, rpcbase.DefaultClass).Connect(ctx)
150150
require.NoError(t, err)
151151

152152
client := serverpb.NewStatusClient(conn)

pkg/gossip/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ go_library(
2626
"//pkg/roachpb",
2727
"//pkg/rpc",
2828
"//pkg/rpc/nodedialer",
29+
"//pkg/rpc/rpcbase",
2930
"//pkg/util",
3031
"//pkg/util/errorutil",
3132
"//pkg/util/grpcutil",

0 commit comments

Comments
 (0)