Merge cockroachdb#132864

132864: admission: fix snapshot queue bug, returning item to wrong pool  r=sumeerbhola a=aadityasondhi

PR includes two commits:

----
[admission: fix snapshot queue bug, returning item to wrong pool](cockroachdb@fad053c) 

Fixes cockroachdb#132534.

Release note: None

----

[admission: make snapshot ingest AC setting metamorphic for tests](cockroachdb@a515b3c) 

Part of: [CRDB-36837](https://cockroachlabs.atlassian.net/browse/CRDB-36837)

Release note: None

Co-authored-by: Aaditya Sondhi <[email protected]>

pkg/util/admission/BUILD.bazel

@@ -36,6 +36,7 @@ go_library(
         "//pkg/util/grunning",
         "//pkg/util/humanizeutil",
         "//pkg/util/log",
+        "//pkg/util/metamorphic",
         "//pkg/util/metric",
         "//pkg/util/queue",
         "//pkg/util/schedulerlatency",

pkg/util/admission/snapshot_queue.go

@@ -14,6 +14,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
+	"github.com/cockroachdb/cockroach/pkg/util/metamorphic"
 	"github.com/cockroachdb/cockroach/pkg/util/metric"
 	"github.com/cockroachdb/cockroach/pkg/util/queue"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
@@ -51,8 +52,9 @@ var DiskBandwidthForSnapshotIngest = settings.RegisterBoolSetting(
 	settings.SystemOnly, "kvadmission.store.snapshot_ingest_bandwidth_control.enabled",
 	"if set to true, snapshot ingests will be subject to disk write control in AC",
 	// TODO(aaditya): Enable by default once enough experimentation is done.
-	false,
-	settings.WithPublic)
+	metamorphic.ConstantWithTestBool("kvadmission.store.snapshot_ingest_bandwidth_control.enabled", false),
+	settings.WithPublic,
+)
 
 var snapshotWaitDur = metric.Metadata{
 	Name:        "admission.wait_durations.snapshot_ingest",
@@ -240,7 +242,7 @@ func releaseSnapshotWorkItem(sw *snapshotWorkItem) {
 	*sw = snapshotWorkItem{
 		admitCh: ch,
 	}
-	waitingWorkPool.Put(sw)
+	snapshotWorkItemPool.Put(sw)
 }
 
 func newSnapshotWorkItem(count int64) *snapshotWorkItem {