rpc,server,testutils: move DRPC cluster setting to rpcbase

Epic: CRDB-48935
Informs: None
Release note: None

Author: cthumuluru-crdb

pkg/rpc/BUILD.bazel

@@ -20,7 +20,6 @@ go_library(
         "keepalive.go",
         "metrics.go",
         "peer.go",
-        "peer_drpc.go",
         "peer_map.go",
         "restricted_internal_client.go",
         "settings.go",

pkg/rpc/nodedialer/nodedialer.go

@@ -171,7 +171,7 @@ func (n *Dialer) DialInternalClient(
 
 	var client rpc.RestrictedInternalClient
 	useStreamPoolClient := shouldUseBatchStreamPoolClient(ctx, n.rpcContext.Settings)
-	if !rpc.ExperimentalDRPCEnabled.Get(&n.rpcContext.Settings.SV) {
+	if !rpcbase.ExperimentalDRPCEnabled.Get(&n.rpcContext.Settings.SV) {
 		gc, conn, err := dial(ctx, n.resolver, n.rpcContext.GRPCDialNode, nodeID, class, true /* checkBreaker */)
 		if err != nil {
 			return nil, errors.Wrapf(err, "gRPC")

pkg/rpc/peer_drpc.go

@@ -25,7 +25,10 @@ go_library(
         "//pkg/keys",
         "//pkg/roachpb",
         "//pkg/rpc/rpcpb",
+        "//pkg/settings",
+        "//pkg/util/buildutil",
         "//pkg/util/envutil",
+        "@com_github_cockroachdb_errors//:errors",
         "@io_storj_drpc//:drpc",
         "@org_golang_google_grpc//:grpc",
     ],

pkg/rpc/rpcbase/BUILD.bazel

@@ -9,10 +9,35 @@ import (
 	"context"
 
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
+	"github.com/cockroachdb/cockroach/pkg/settings"
+	"github.com/cockroachdb/cockroach/pkg/util/buildutil"
+	"github.com/cockroachdb/cockroach/pkg/util/envutil"
+	"github.com/cockroachdb/errors"
 	"google.golang.org/grpc"
 	"storj.io/drpc"
 )
 
+var envExperimentalDRPCEnabled = envutil.EnvOrDefaultBool("COCKROACH_EXPERIMENTAL_DRPC_ENABLED", false)
+
+// ExperimentalDRPCEnabled determines whether a drpc server accepting BatchRequest
+// is enabled. This server is experimental and completely unsuitable to production
+// usage (for example, does not implement authorization checks).
+var ExperimentalDRPCEnabled = settings.RegisterBoolSetting(
+	settings.ApplicationLevel,
+	"rpc.experimental_drpc.enabled",
+	"if true, use drpc to execute Batch RPCs (instead of gRPC)",
+	envExperimentalDRPCEnabled,
+	settings.WithValidateBool(func(values *settings.Values, b bool) error {
+		// drpc support is highly experimental and should not be enabled in production.
+		// Since authorization is not implemented, we only even host the server if the
+		// env var is set or it's a CRDB test build. Consequently, these are prereqs
+		// for setting the cluster setting.
+		if b && !(envExperimentalDRPCEnabled || buildutil.CrdbTestBuild) {
+			return errors.New("experimental drpc is not allowed in this environment")
+		}
+		return nil
+	}))
+
 // TODODRPC is a marker to identify each RPC client creation site that needs to
 // be updated to support DRPC.
 const TODODRPC = false

pkg/rpc/rpcbase/nodedialer.go

@@ -10,6 +10,7 @@ import (
 	"crypto/tls"
 
 	"github.com/cockroachdb/cockroach/pkg/rpc"
+	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/server/srverrors"
 	"github.com/cockroachdb/errors"
 	"google.golang.org/grpc/codes"
@@ -34,7 +35,7 @@ type drpcServer struct {
 // DRPC if the experimental setting is on, otherwise returns a dummy server.
 func newDRPCServer(ctx context.Context, rpcCtx *rpc.Context) (*drpcServer, error) {
 	drpcServer := &drpcServer{}
-	if rpc.ExperimentalDRPCEnabled.Get(&rpcCtx.Settings.SV) {
+	if rpcbase.ExperimentalDRPCEnabled.Get(&rpcCtx.Settings.SV) {
 		d, err := rpc.NewDRPCServer(ctx, rpcCtx)
 		if err != nil {
 			return nil, err

pkg/server/drpc_server.go

@@ -43,7 +43,7 @@ func TestDRPCBatchServer(t *testing.T) {
 		args.ServerArgs.Insecure = insecure
 		args.ReplicationMode = base.ReplicationManual
 		args.ServerArgs.Settings = cluster.MakeClusterSettings()
-		rpc.ExperimentalDRPCEnabled.Override(ctx, &args.ServerArgs.Settings.SV, true)
+		rpcbase.ExperimentalDRPCEnabled.Override(ctx, &args.ServerArgs.Settings.SV, true)
 		c := testcluster.StartTestCluster(t, numNodes, args)
 		defer c.Stopper().Stop(ctx)
 
@@ -99,7 +99,7 @@ func TestStreamContextCancel(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	rpc.ExperimentalDRPCEnabled.Override(ctx, &args.ServerArgs.Settings.SV, true)
+	rpcbase.ExperimentalDRPCEnabled.Override(ctx, &args.ServerArgs.Settings.SV, true)
 	c := testcluster.StartTestCluster(t, numNodes, args)
 	defer c.Stopper().Stop(ctx)
 
@@ -225,6 +225,7 @@ func TestDialDRPC_InterceptorsAreSet(t *testing.T) {
 		},
 	}
 
+	rpcbase.ExperimentalDRPCEnabled.Override(ctx, &args.ServerArgs.Settings.SV, true)
 	c := testcluster.StartTestCluster(t, numNodes, args)
 	defer c.Stopper().Stop(ctx)
 	rpcAddr := c.Server(0).RPCAddr()

pkg/server/drpc_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
-	"github.com/cockroachdb/cockroach/pkg/rpc"
+	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
@@ -29,7 +29,7 @@ func TestDRPCSelectQuery(t *testing.T) {
 		defer cancel()
 
 		st := cluster.MakeTestingClusterSettings()
-		rpc.ExperimentalDRPCEnabled.Override(ctx, &st.SV, true)
+		rpcbase.ExperimentalDRPCEnabled.Override(ctx, &st.SV, true)
 
 		tc := serverutils.StartCluster(t, 3, base.TestClusterArgs{
 			ServerArgs: base.TestServerArgs{

pkg/server/server_drpc_test.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/cockroachdb/cmux"
 	"github.com/cockroachdb/cockroach/pkg/rpc"
+	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/netutil"
@@ -137,8 +138,8 @@ func startListenRPCAndSQL(
 	// Host drpc only if it's _possible_ to turn it on (this requires a test build
 	// or env var). If the setting _is_ on, then it was overridden in testing and
 	// we want to host the server too.
-	hostDRPC := rpc.ExperimentalDRPCEnabled.Validate(nil /* not used */, true) == nil ||
-		rpc.ExperimentalDRPCEnabled.Get(&cfg.Settings.SV)
+	hostDRPC := rpcbase.ExperimentalDRPCEnabled.Validate(nil /* not used */, true) == nil ||
+		rpcbase.ExperimentalDRPCEnabled.Get(&cfg.Settings.SV)
 
 	// If we're not hosting drpc, make a listener that never accepts anything.
 	// We will start the dRPC server all the same; it barely consumes any

pkg/server/start_listen.go

@@ -31,6 +31,7 @@ go_library(
         "//pkg/multitenant/tenantcapabilitiespb",
         "//pkg/roachpb",
         "//pkg/rpc",
+        "//pkg/rpc/rpcbase",
         "//pkg/security/securitytest",
         "//pkg/security/username",
         "//pkg/server/decommissioning",