os/bluestore: properly reset zoned allocator on startup

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index bd22830f7277ee3b8ff37d380d9e7fb0e4cf1265..39c2865b3434208cbbafe610e5fe4c1304464c8a 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -6695,6 +6695,7 @@ int BlueStore::mkfs()
     freelist_type = "zoned";
     zone_size = bdev->get_zone_size();
     first_sequential_zone = bdev->get_conventional_region_size() / zone_size;
+    bdev->reset_all_zones();
   } else
 #endif
   {

diff --git a/src/os/bluestore/ZonedAllocator.cc b/src/os/bluestore/ZonedAllocator.cc
index 499cd72bf2f99ecaf45348011105f3d99d970b2a..6425919639892e71c6223b06635236e6387c20ba 100644 (file)
--- a/src/os/bluestore/ZonedAllocator.cc
+++ b/src/os/bluestore/ZonedAllocator.cc
@@ -42,6 +42,9 @@ ZonedAllocator::ZonedAllocator(CephContext* cct,
                 << std::dec
                 << dendl;
   ceph_assert(size % zone_size == 0);
+
+  zone_states.resize(num_zones);
+  num_free = num_zones * zone_size;
 }
 
 ZonedAllocator::~ZonedAllocator()