From: Yite Gu <yitegu0@gmail.com>
Date: Fri, 6 Sep 2024 10:00:46 +0000 (+0800)
Subject: tools/ceph-bluestore-tool: optimize offline trim report info
X-Git-Tag: v20.0.0~241^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=548d069a00e65b0a9fb46e57b9086e9256d6a804;p=ceph.git

tools/ceph-bluestore-tool: optimize offline trim report info

Fixes: https://tracker.ceph.com/issues/67932
Signed-off-by: Yite Gu <yitegu0@gmail.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 4ad76faa76d2..516d2bd2e8ce 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -4817,11 +4817,16 @@ void BlueFS::trim_free_space(const string& type, std::ostream& outss)
     outss << "device " << type << " is not configured";
     return;
   }
-  if (alloc[bdev_id] && !is_shared_alloc(bdev_id)) {
+  if (alloc[bdev_id]) {
     if (!bdev[bdev_id]->is_discard_supported()) {
       outss << "device " << type << " does not support trim";
       return;
     }
+    if (is_shared_alloc(bdev_id)) {
+      outss << "device " << type
+            << " shares allocations with main device, trimming skipped.";
+      return;
+    }
     alloc[bdev_id]->foreach(iterated_allocation);
     outss << "device " << type << " trim done";
   }