From fad053c8228315896373231c92a9e2a06bf9b626 Mon Sep 17 00:00:00 2001 From: Aaditya Sondhi <20070511+aadityasondhi@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:59:03 -0400 Subject: [PATCH 1/2] admission: fix snapshot queue bug, returning item to wrong pool Fixes #132534. Release note: None --- pkg/util/admission/snapshot_queue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/admission/snapshot_queue.go b/pkg/util/admission/snapshot_queue.go index 663e55175f6..9843b4c8964 100644 --- a/pkg/util/admission/snapshot_queue.go +++ b/pkg/util/admission/snapshot_queue.go @@ -240,7 +240,7 @@ func releaseSnapshotWorkItem(sw *snapshotWorkItem) { *sw = snapshotWorkItem{ admitCh: ch, } - waitingWorkPool.Put(sw) + snapshotWorkItemPool.Put(sw) } func newSnapshotWorkItem(count int64) *snapshotWorkItem { From 989427cd7454a713cd5b783c19a8c6f20d45fbfb Mon Sep 17 00:00:00 2001 From: Aaditya Sondhi <20070511+aadityasondhi@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:08:13 -0400 Subject: [PATCH 2/2] admission: make snapshot ingest AC setting metamorphic for tests Part of: CRDB-36837 Release note: None --- pkg/util/admission/BUILD.bazel | 1 + pkg/util/admission/snapshot_queue.go | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/util/admission/BUILD.bazel b/pkg/util/admission/BUILD.bazel index 8182456031f..a49a31877d6 100644 --- a/pkg/util/admission/BUILD.bazel +++ b/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", diff --git a/pkg/util/admission/snapshot_queue.go b/pkg/util/admission/snapshot_queue.go index 9843b4c8964..6a4eb7720ed 100644 --- a/pkg/util/admission/snapshot_queue.go +++ b/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",