blk/kernel: New perf counter to view amount of discard threads.

ifed01 · ifed01 · commit 24d60025ef2a · 2025-03-13T13:36:28.000+03:00
Signed-off-by: Igor Fedotov <igor.fedotov@croit.io> (cherry picked from commit 5aba1c9)
diff --git a/src/blk/kernel/KernelDevice.cc b/src/blk/kernel/KernelDevice.cc
@@ -96,6 +96,8 @@ KernelDevice::KernelDevice(CephContext* cct, aio_callback_t cb, void *cbpriv, ai
   b.set_prio_default(PerfCountersBuilder::PRIO_USEFUL);
   b.add_u64_counter(l_blk_kernel_device_discard_op, "discard_op",
             "Number of discard ops issued to kernel device");
+  b.add_u64_counter(l_blk_kernel_discard_threads, "discard_threads",
+            "Number of discard threads running");
 
   logger.reset(b.create_perf_counters());
   cct->get_perfcounters_collection()->add(logger.get());
@@ -589,6 +591,7 @@ void KernelDevice::_discard_update_threads(bool discard_stop)
       t->join();
     }
   }
+  logger->set(l_blk_kernel_discard_threads, discard_threads.size());
 }
 
 void KernelDevice::_discard_stop()
diff --git a/src/blk/kernel/KernelDevice.h b/src/blk/kernel/KernelDevice.h
@@ -32,6 +32,7 @@
 enum {
   l_blk_kernel_device_first = 1000,
   l_blk_kernel_device_discard_op,
+  l_blk_kernel_discard_threads,
   l_blk_kernel_device_last,
 };
 

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ KernelDevice::KernelDevice(CephContext* cct, aio_callback_t cb, void *cbpriv, ai`
`96`	`96`	`b.set_prio_default(PerfCountersBuilder::PRIO_USEFUL);`
`97`	`97`	`b.add_u64_counter(l_blk_kernel_device_discard_op, "discard_op",`
`98`	`98`	`"Number of discard ops issued to kernel device");`
	`99`	`+ b.add_u64_counter(l_blk_kernel_discard_threads, "discard_threads",`
	`100`	`+ "Number of discard threads running");`
`99`	`101`
`100`	`102`	`logger.reset(b.create_perf_counters());`
`101`	`103`	`cct->get_perfcounters_collection()->add(logger.get());`
`@@ -589,6 +591,7 @@ void KernelDevice::_discard_update_threads(bool discard_stop)`
`589`	`591`	`t->join();`
`590`	`592`	`}`
`591`	`593`	`}`
	`594`	`+ logger->set(l_blk_kernel_discard_threads, discard_threads.size());`
`592`	`595`	`}`
`593`	`596`
`594`	`597`	`void KernelDevice::_discard_stop()`