Merge pull request ceph#59633 from YiteGu/optimize-offline-trim-report-info

aclamk · web-flow · commit eb01854b304b · 2025-02-05T20:36:27.000+01:00
tools/ceph-bluestore-tool: optimize offline trim report info
diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
@@ -4867,11 +4867,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";
   }

Original file line number	Diff line number	Diff line change
`@@ -4867,11 +4867,16 @@ void BlueFS::trim_free_space(const string& type, std::ostream& outss)`
`4867`	`4867`	`outss << "device " << type << " is not configured";`
`4868`	`4868`	`return;`
`4869`	`4869`	`}`
`4870`		`- if (alloc[bdev_id] && !is_shared_alloc(bdev_id)) {`
	`4870`	`+ if (alloc[bdev_id]) {`
`4871`	`4871`	`if (!bdev[bdev_id]->is_discard_supported()) {`
`4872`	`4872`	`outss << "device " << type << " does not support trim";`
`4873`	`4873`	`return;`
`4874`	`4874`	`}`
	`4875`	`+ if (is_shared_alloc(bdev_id)) {`
	`4876`	`+ outss << "device " << type`
	`4877`	`+ << " shares allocations with main device, trimming skipped.";`
	`4878`	`+ return;`
	`4879`	`+ }`
`4875`	`4880`	`alloc[bdev_id]->foreach(iterated_allocation);`
`4876`	`4881`	`outss << "device " << type << " trim done";`
`4877`	`4882`	`}`