From 548d069a00e65b0a9fb46e57b9086e9256d6a804 Mon Sep 17 00:00:00 2001 From: Yite Gu Date: Fri, 6 Sep 2024 18:00:46 +0800 Subject: [PATCH] tools/ceph-bluestore-tool: optimize offline trim report info Fixes: https://tracker.ceph.com/issues/67932 Signed-off-by: Yite Gu --- src/os/bluestore/BlueFS.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 4ad76faa76d..516d2bd2e8c 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"; } -- 2.39.5