os/bluestore: Fix read_main_bdev_label

When valid label with new epoch is found,
all that we have marked as good before are released.

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e00aedc1f7172b63ddd3f38935138ae1df2d5b5c..eda144b56925c1c00d9e0b70ac596351eed2f0b4 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -6678,9 +6678,13 @@ int BlueStore::_read_main_bdev_label(
             *out_is_multi = true;
           }
           if(out_valid_positions) {
-            out_valid_positions->push_back(position);
+            // clear out old versions
+            out_valid_positions->clear();
           }
         }
+        if(v == epoch && out_valid_positions) {
+          out_valid_positions->push_back(position);
+        }
       }
     } else if (r == 1) {
       // tried to read but no disk