From: Igor Fedotov <igor.fedotov@croit.io>
Date: Thu, 6 Mar 2025 07:49:06 +0000 (+0300)
Subject: blk/kerneldevice: count ops not bytes in discard_op perf counter
X-Git-Tag: v19.2.3~168^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=967d0d04ee224097e482c50095e13b376b8a9ad4;p=ceph.git

blk/kerneldevice: count ops not bytes in discard_op perf counter

Fixes: https://tracker.ceph.com/issues/70335

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit d7467b0992e41f03f49428e64c36df0cdf9b26fa)
---

diff --git a/src/blk/kernel/KernelDevice.cc b/src/blk/kernel/KernelDevice.cc
index 283f94c7542e4..0b5f44bd65200 100644
--- a/src/blk/kernel/KernelDevice.cc
+++ b/src/blk/kernel/KernelDevice.cc
@@ -809,7 +809,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());
       }