Merge pull request ceph#57261 from tchaikov/test_bluefs-fix-asan

test/objectstore/test_bluefs: fix heap-use-after-free

Reviewed-by: Igor Fedotov <[email protected]>

Author: tchaikov

src/test/objectstore/test_bluefs.cc

@@ -1256,14 +1256,20 @@ TEST(BlueFS, test_shared_alloc_sparse) {
     }
   }
   fs.compact_log();
-  auto *logger = fs.get_perf_counters();
-  ASSERT_NE(logger->get(l_bluefs_alloc_shared_size_fallbacks), 0);
-  auto num_files = logger->get(l_bluefs_num_files);
-  fs.umount();
 
-  fs.mount();
-  ASSERT_EQ(num_files, logger->get(l_bluefs_num_files));
-  fs.umount();
+  uint64_t num_files = 0;
+  {
+    auto *logger = fs.get_perf_counters();
+    ASSERT_NE(logger->get(l_bluefs_alloc_shared_size_fallbacks), 0);
+    num_files = logger->get(l_bluefs_num_files);
+    fs.umount();
+  }
+  {
+    fs.mount();
+    auto *logger = fs.get_perf_counters();
+    ASSERT_EQ(num_files, logger->get(l_bluefs_num_files));
+    fs.umount();
+  }
 }
 
 TEST(BlueFS, test_4k_shared_alloc) {
@@ -1326,15 +1332,21 @@ TEST(BlueFS, test_4k_shared_alloc) {
     }
   }
   fs.compact_log();
-  auto *logger = fs.get_perf_counters();
-  ASSERT_EQ(logger->get(l_bluefs_alloc_shared_dev_fallbacks), 0);
-  ASSERT_EQ(logger->get(l_bluefs_alloc_shared_size_fallbacks), 0);
-  auto num_files = logger->get(l_bluefs_num_files);
-  fs.umount();
 
-  fs.mount();
-  ASSERT_EQ(num_files, logger->get(l_bluefs_num_files));
-  fs.umount();
+  uint64_t num_files = 0;
+  {
+    auto *logger = fs.get_perf_counters();
+    ASSERT_EQ(logger->get(l_bluefs_alloc_shared_dev_fallbacks), 0);
+    ASSERT_EQ(logger->get(l_bluefs_alloc_shared_size_fallbacks), 0);
+    num_files = logger->get(l_bluefs_num_files);
+    fs.umount();
+  }
+  {
+    fs.mount();
+    auto *logger = fs.get_perf_counters();
+    ASSERT_EQ(num_files, logger->get(l_bluefs_num_files));
+    fs.umount();
+  }
 }
 
 void create_files(BlueFS &fs,