Skip to content

Commit ddbc0e9

Browse files
authored
Merge pull request ceph#56587 from tchaikov/wip-bluefs-use-after-free
test/objectstore/test_bluefs: fix heap-use-after-free Reviewed-by: Igor Fedotov <[email protected]>
2 parents 2ecf63a + b8c30a7 commit ddbc0e9

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

src/test/objectstore/test_bluefs.cc

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,13 +1174,19 @@ TEST(BlueFS, test_shared_alloc) {
11741174
}
11751175
}
11761176
fs.compact_log();
1177-
auto *logger = fs.get_perf_counters();
1178-
ASSERT_NE(logger->get(l_bluefs_alloc_shared_dev_fallbacks), 0);
1179-
auto num_files = logger->get(l_bluefs_num_files);
1180-
fs.umount();
1181-
fs.mount();
1182-
ASSERT_EQ(num_files, logger->get(l_bluefs_num_files));
1183-
fs.umount();
1177+
uint64_t num_files = 0;
1178+
{
1179+
auto *logger = fs.get_perf_counters();
1180+
ASSERT_NE(logger->get(l_bluefs_alloc_shared_dev_fallbacks), 0);
1181+
num_files = logger->get(l_bluefs_num_files);
1182+
fs.umount();
1183+
}
1184+
{
1185+
fs.mount();
1186+
auto *logger = fs.get_perf_counters();
1187+
ASSERT_EQ(num_files, logger->get(l_bluefs_num_files));
1188+
fs.umount();
1189+
}
11841190
}
11851191

11861192
TEST(BlueFS, test_shared_alloc_sparse) {

0 commit comments

Comments
 (0)