Merge pull request ceph#62150 from ifed01/wip-ifed-fix-discard-op

ifed01 · web-flow · commit 5a7885ae52a1 · 2025-03-08T00:03:58.000+03:00
blk/kerneldevice: count ops not bytes in discard_op perf counter

Reviewed-by: guyite@bytedance.com
diff --git a/src/blk/kernel/KernelDevice.cc b/src/blk/kernel/KernelDevice.cc
@@ -818,7 +818,7 @@ void KernelDevice::_discard_thread(uint64_t tid)
       discard_running ++;
       l.unlock();
       dout(20) << __func__ << " finishing" << dendl;
-      logger->inc(l_blk_kernel_device_discard_op, discard_processing.size());
+      logger->inc(l_blk_kernel_device_discard_op, discard_processing.num_intervals());
       for (auto p = discard_processing.begin(); p != discard_processing.end(); ++p) {
         _discard(p.get_start(), p.get_len());
       }

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ void KernelDevice::_discard_thread(uint64_t tid)`
`818`	`818`	`discard_running ++;`
`819`	`819`	`l.unlock();`
`820`	`820`	`dout(20) << __func__ << " finishing" << dendl;`
`821`		`- logger->inc(l_blk_kernel_device_discard_op, discard_processing.size());`
	`821`	`+ logger->inc(l_blk_kernel_device_discard_op, discard_processing.num_intervals());`
`822`	`822`	`for (auto p = discard_processing.begin(); p != discard_processing.end(); ++p) {`
`823`	`823`	`_discard(p.get_start(), p.get_len());`
`824`	`824`	`}`