From 45cd855fd12bbfa6f548e5a041905949b0f02006 Mon Sep 17 00:00:00 2001
From: Austen McClernon <austen@cockroachlabs.com>
Date: Tue, 17 Sep 2024 18:51:14 -0400
Subject: [PATCH] kvserver: [dnm] hack rac2 enabled

DNM, hack in changes required to enable rac2 for testing in prior
commits.

Part of: #130187
Release note: None
---
 pkg/kv/kvserver/kvadmission/BUILD.bazel    | 1 +
 pkg/kv/kvserver/kvadmission/kvadmission.go | 3 ++-
 pkg/kv/kvserver/replica.go                 | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/kv/kvserver/kvadmission/BUILD.bazel b/pkg/kv/kvserver/kvadmission/BUILD.bazel
index 5df579399fbd..49239170414e 100644
--- a/pkg/kv/kvserver/kvadmission/BUILD.bazel
+++ b/pkg/kv/kvserver/kvadmission/BUILD.bazel
@@ -10,6 +10,7 @@ go_library(
         "//pkg/kv/kvpb",
         "//pkg/kv/kvserver/kvflowcontrol",
         "//pkg/kv/kvserver/kvflowcontrol/kvflowcontrolpb",
+        "//pkg/kv/kvserver/kvflowcontrol/rac2",
         "//pkg/kv/kvserver/kvflowcontrol/replica_rac2",
         "//pkg/kv/kvserver/raftlog",
         "//pkg/raft/raftpb",
diff --git a/pkg/kv/kvserver/kvadmission/kvadmission.go b/pkg/kv/kvserver/kvadmission/kvadmission.go
index e28ecfd5de48..02ed7b6dee3d 100644
--- a/pkg/kv/kvserver/kvadmission/kvadmission.go
+++ b/pkg/kv/kvserver/kvadmission/kvadmission.go
@@ -21,6 +21,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvflowcontrol"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvflowcontrol/kvflowcontrolpb"
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvflowcontrol/rac2"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvflowcontrol/replica_rac2"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/raftlog"
 	"github.com/cockroachdb/cockroach/pkg/raft/raftpb"
@@ -356,7 +357,7 @@ func (n *controllerImpl) AdmitKVWork(
 					// TODO(sumeerbhola,kvoli): The priority needs to be converted to a
 					// raftpb.Priority when v2 encoding is enabled. e.g.,
 					// rac2.AdmissionToRaftPriority().
-					AdmissionPriority:   int32(admissionInfo.Priority),
+					AdmissionPriority:   int32(rac2.AdmissionToRaftPriority(admissionInfo.Priority)),
 					AdmissionCreateTime: admissionInfo.CreateTime,
 					AdmissionOriginNode: n.nodeID.Get(),
 				}
diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go
index 36620181e6ae..828c3977b938 100644
--- a/pkg/kv/kvserver/replica.go
+++ b/pkg/kv/kvserver/replica.go
@@ -2531,7 +2531,9 @@ func racV2EnabledWhenLeaderLevel(
 	ctx context.Context, st *cluster.Settings,
 ) replica_rac2.EnabledWhenLeaderLevel {
 	// TODO(sumeer): implement fully, once all the dependencies are implemented.
-	return replica_rac2.NotEnabledWhenLeader
+	// TODO(kvoli): Should this be a cluster setting, or are we ratcheting it up
+	// via cluster version.
+	return replica_rac2.EnabledWhenLeaderV2Encoding
 }
 
 // maybeEnqueueProblemRange will enqueue the replica for processing into the