Skip to content

Commit 7a50999

Browse files
committed
crimson/os/seastore: test_mkfs() into coroutines
Signed-off-by: Matan Breizman <[email protected]>
1 parent 32eff35 commit 7a50999

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

src/crimson/os/seastore/seastore.cc

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -398,24 +398,16 @@ SeaStore::mkfs_ertr::future<> SeaStore::test_mkfs(uuid_d new_osd_fsid)
398398
INFO("uuid={} ...", new_osd_fsid);
399399

400400
ceph_assert(seastar::this_shard_id() == primary_core);
401-
return read_meta("mkfs_done"
402-
).then([this, new_osd_fsid, FNAME](auto tuple) {
403-
auto [done, value] = tuple;
404-
if (done == 0) {
405-
ERROR("failed");
406-
return seastar::now();
407-
}
408-
return shard_stores.local().mkfs_managers(
409-
).safe_then([this, new_osd_fsid] {
410-
return prepare_meta(new_osd_fsid);
411-
}).safe_then([FNAME] {
412-
INFO("done");
413-
}).handle_error(
414-
crimson::ct_error::assert_all{
415-
"Invalid error in SeaStore::mkfs"
416-
}
417-
);
418-
});
401+
// todo: read_meta to return errorator
402+
auto [done, value] = co_await read_meta("mkfs_done");
403+
if (done == 0) {
404+
ERROR("failed");
405+
co_return;
406+
}
407+
co_await shard_stores.local().mkfs_managers().handle_error(
408+
crimson::ct_error::assert_all{"Invalid error in SeaStore::mkfs"});
409+
co_await prepare_meta(new_osd_fsid);
410+
INFO("done");
419411
}
420412

421413
seastar::future<> SeaStore::prepare_meta(uuid_d new_osd_fsid)

0 commit comments

Comments
 (0)