admission: remove unused grantKind

Epic: none

Release note: None

Author: sumeerbhola

pkg/util/admission/admission.go

@@ -167,7 +167,6 @@ type requester interface {
 // WorkKind will interact with a granter. See admission.go for an overview of
 // how this fits into the overall structure.
 type granter interface {
-	grantKind() grantKind
 	// tryGet is used by a requester to get slots/tokens for a piece of work
 	// that has encountered no waiting/queued work. This is the fast path that
 	// avoids queueing in the requester. The optional parameter
@@ -379,8 +378,9 @@ type elasticCPULimiter interface {
 // expect this to be called every scheduler_latency.sample_period.
 type SchedulerLatencyListener = schedulerlatency.LatencyObserver
 
-// grantKind represents the two kind of ways we grant admission: using a slot
-// or a token. The slot terminology is akin to a scheduler, where a scheduling
+// There are two ways we grant admission: using a slot or a token.
+//
+// The slot terminology is akin to a scheduler, where a scheduling
 // slot must be free for a thread to run. But unlike a scheduler, we don't
 // have visibility into the fact that work execution may be blocked on IO. So
 // a slot can also be viewed as a limit on concurrency of ongoing work. The
@@ -402,12 +402,6 @@ type SchedulerLatencyListener = schedulerlatency.LatencyObserver
 // completion information such as how many tokens were actually used, which
 // can differ from the up front information, and is utilized to adjust the
 // available tokens.
-type grantKind int8
-
-const (
-	slot grantKind = iota
-	token
-)
 
 type grantResult int8
 

pkg/util/admission/elastic_cpu_granter.go

@@ -140,11 +140,6 @@ func (e *elasticCPUGranter) setRequester(requester requester) {
 	e.requester = requester
 }
 
-// grantKind implements granter.
-func (e *elasticCPUGranter) grantKind() grantKind {
-	return token
-}
-
 // tryGet implements granter.
 func (e *elasticCPUGranter) tryGet(_ burstQualification, count int64) (granted bool) {
 	e.mu.Lock()

pkg/util/admission/elastic_cpu_work_queue_test.go

@@ -126,10 +126,6 @@ type testElasticCPUGranter struct {
 
 var _ granter = &testElasticCPUGranter{}
 
-func (t *testElasticCPUGranter) grantKind() grantKind {
-	return token
-}
-
 func (t *testElasticCPUGranter) tryGet(_ burstQualification, count int64) (granted bool) {
 	panic("unimplemented")
 }

pkg/util/admission/granter.go

@@ -47,11 +47,6 @@ type slotGranter struct {
 var _ granterWithLockedCalls = &slotGranter{}
 var _ granter = &slotGranter{}
 
-// grantKind implements granter.
-func (sg *slotGranter) grantKind() grantKind {
-	return slot
-}
-
 // tryGet implements granter.
 func (sg *slotGranter) tryGet(_ burstQualification, count int64) bool {
 	return sg.coord.tryGet(sg.workKind, count, 0 /*arbitrary*/)
@@ -188,11 +183,6 @@ func (tg *tokenGranter) refillBurstTokens(skipTokenEnforcement bool) {
 	tg.skipTokenEnforcement = skipTokenEnforcement
 }
 
-// grantKind implements granter.
-func (tg *tokenGranter) grantKind() grantKind {
-	return token
-}
-
 // tryGet implements granter.
 func (tg *tokenGranter) tryGet(_ burstQualification, count int64) bool {
 	return tg.coord.tryGet(tg.workKind, count, 0 /*arbitrary*/)
@@ -336,11 +326,6 @@ type kvStoreTokenChildGranter struct {
 var _ granterWithStoreReplicatedWorkAdmitted = &kvStoreTokenChildGranter{}
 var _ granter = &kvStoreTokenChildGranter{}
 
-// grantKind implements granter.
-func (cg *kvStoreTokenChildGranter) grantKind() grantKind {
-	return token
-}
-
 // tryGet implements granter.
 func (cg *kvStoreTokenChildGranter) tryGet(_ burstQualification, count int64) bool {
 	return cg.parent.tryGet(cg.workType, count)

pkg/util/admission/replicated_write_admission_test.go

@@ -380,9 +380,6 @@ func newTestReplicatedWriteGranter(
 		buf: buf,
 	}
 }
-func (tg *testReplicatedWriteGranter) grantKind() grantKind {
-	return token
-}
 
 func (tg *testReplicatedWriteGranter) tryGet(_ burstQualification, count int64) bool {
 	if count > tg.tokens {

pkg/util/admission/snapshot_queue_test.go

@@ -46,7 +46,7 @@ func TestSnapshotQueue(t *testing.T) {
 			switch d.Cmd {
 			case "init":
 				closeFn()
-				tg = &testGranter{gk: token, buf: &buf}
+				tg = &testGranter{buf: &buf}
 				q = makeSnapshotQueue(tg, metrics)
 				q.ts = timeutil.NewManualTime(initialTime)
 				tg.r = q

pkg/util/admission/work_queue_test.go

@@ -58,7 +58,6 @@ func (b *builderWithMu) stringAndReset() string {
 }
 
 type testGranter struct {
-	gk   grantKind
 	name string
 	buf  *builderWithMu
 	r    requester
@@ -70,10 +69,6 @@ type testGranter struct {
 
 var _ granterWithStoreReplicatedWorkAdmitted = &testGranter{}
 
-func (tg *testGranter) grantKind() grantKind {
-	return tg.gk
-}
-
 func (tg *testGranter) tryGet(_ burstQualification, count int64) bool {
 	tg.buf.printf("tryGet%s: returning %t", tg.name, tg.returnValueFromTryGet)
 	return tg.returnValueFromTryGet
@@ -192,7 +187,7 @@ func TestWorkQueueBasic(t *testing.T) {
 			switch d.Cmd {
 			case "init":
 				closeFn()
-				tg = &testGranter{gk: slot, buf: &buf}
+				tg = &testGranter{buf: &buf}
 				opts := makeWorkQueueOptions(KVWork)
 				timeSource = timeutil.NewManualTime(initialTime)
 				opts.timeSource = timeSource
@@ -375,7 +370,7 @@ func TestWorkQueueTokenResetRace(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	var buf builderWithMu
-	tg := &testGranter{gk: slot, buf: &buf}
+	tg := &testGranter{buf: &buf}
 	st := cluster.MakeTestingClusterSettings()
 	registry := metric.NewRegistry()
 	metrics := makeWorkQueueMetrics("", registry)
@@ -566,8 +561,8 @@ func TestStoreWorkQueueBasic(t *testing.T) {
 			switch d.Cmd {
 			case "init":
 				closeFn()
-				tg[admissionpb.RegularWorkClass] = &testGranter{gk: token, name: " regular", buf: &buf}
-				tg[admissionpb.ElasticWorkClass] = &testGranter{gk: token, name: " elastic", buf: &buf}
+				tg[admissionpb.RegularWorkClass] = &testGranter{name: " regular", buf: &buf}
+				tg[admissionpb.ElasticWorkClass] = &testGranter{name: " elastic", buf: &buf}
 				opts := makeWorkQueueOptions(KVWork)
 				opts.usesTokens = true
 				opts.timeSource = timeutil.NewManualTime(timeutil.FromUnixMicros(0))