]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: Fix repair for multi label
authorAdam Kupczyk <akupczyk@ibm.com>
Fri, 2 Feb 2024 12:30:09 +0000 (12:30 +0000)
committerPere Diaz Bou <pere-altea@hotmail.com>
Fri, 23 Aug 2024 09:49:24 +0000 (11:49 +0200)
When there was no bdev labels to repair, assert happened.

Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit 140dc2e74d72af21c3a84d3ffa29f1806ca4965a)

src/os/bluestore/BlueStore.cc

index efec940a962acfe68cafd40c952988f0fad668a3..1db2222f9b1f2df088f45fd0bd120c6b68871b36 100644 (file)
@@ -11095,7 +11095,7 @@ int BlueStore::_fsck_on_open(BlueStore::FSCKDepth depth, bool repair)
     repaired = repairer.apply(db);
     dout(5) << __func__ << " repair applied" << dendl;
   }
-  if (repair) {
+  if (repair && bdev_labels_in_repair.size() > 0) {
     // Now fix bdev_labels that were detected to be broken & repairable.
     string p = path + "/block";
     _write_bdev_label(cct, p, bdev_label, bdev_labels_in_repair);