From 54ec7919b8ae1ff305035149d30d5c359a29a118 Mon Sep 17 00:00:00 2001
From: John Spray <john@neon.tech>
Date: Mon, 14 Aug 2023 14:59:26 +0100
Subject: [PATCH] pageserver: add deletion queue submitted/executed metrics

---
 pageserver/src/deletion_queue.rs |  3 +++
 pageserver/src/metrics.rs        | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/pageserver/src/deletion_queue.rs b/pageserver/src/deletion_queue.rs
index 68b0616239..ef9275ac81 100644
--- a/pageserver/src/deletion_queue.rs
+++ b/pageserver/src/deletion_queue.rs
@@ -1,3 +1,4 @@
+use crate::metrics::{DELETION_QUEUE_EXECUTED, DELETION_QUEUE_SUBMITTED};
 use remote_storage::{GenericRemoteStorage, RemotePath};
 use serde::Deserialize;
 use serde::Serialize;
@@ -137,6 +138,7 @@ impl DeletionQueueClient {
         timeline_id: TimelineId,
         layers: Vec<LayerFileName>,
     ) {
+        DELETION_QUEUE_SUBMITTED.inc_by(layers.len() as u64);
         self.do_push(FrontendQueueMessage::Delete(DeletionOp {
             tenant_id,
             timeline_id,
@@ -191,6 +193,7 @@ impl BackendQueueWorker {
     async fn maybe_execute(&mut self) {
         match self.remote_storage.delete_objects(&self.accumulator).await {
             Ok(()) => {
+                DELETION_QUEUE_EXECUTED.inc_by(self.accumulator.len() as u64);
                 self.accumulator.clear();
                 self.executed_lists.append(&mut self.pending_lists);
             }
diff --git a/pageserver/src/metrics.rs b/pageserver/src/metrics.rs
index f64d11d058..4735ead418 100644
--- a/pageserver/src/metrics.rs
+++ b/pageserver/src/metrics.rs
@@ -658,6 +658,22 @@ static REMOTE_TIMELINE_CLIENT_CALLS_STARTED_HIST: Lazy<HistogramVec> = Lazy::new
     .expect("failed to define a metric")
 });
 
+pub(crate) static DELETION_QUEUE_SUBMITTED: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "pageserver_deletion_queue_submitted",
+        "Number of objects submitted for deletion"
+    )
+    .expect("failed to define a metric")
+});
+
+pub(crate) static DELETION_QUEUE_EXECUTED: Lazy<IntCounter> = Lazy::new(|| {
+    register_int_counter!(
+        "pageserver_deletion_queue_executed",
+        "Number of objects deleted"
+    )
+    .expect("failed to define a metric")
+});
+
 static REMOTE_TIMELINE_CLIENT_BYTES_STARTED_COUNTER: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
         "pageserver_remote_timeline_client_bytes_started",