From 2e5aeb8651fb06d298d36a89156abd0689f35bb4 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 21 Oct 2021 23:15:07 -0700 Subject: [PATCH] crimson/tools/store_nbd/fs_driver: fix mount and mkfs to handle new mkfs signature Introduced: e5f7ff Fixes: https://tracker.ceph.com/issues/53012 Signed-off-by: Samuel Just --- src/crimson/tools/store_nbd/fs_driver.cc | 26 ++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/crimson/tools/store_nbd/fs_driver.cc b/src/crimson/tools/store_nbd/fs_driver.cc index 436ceeb9dc512..c2834dcc6e52b 100644 --- a/src/crimson/tools/store_nbd/fs_driver.cc +++ b/src/crimson/tools/store_nbd/fs_driver.cc @@ -199,7 +199,18 @@ seastar::future<> FSDriver::mkfs() init(); return fs->start(); }).then([this] { - return fs->mount(); + return fs->mount( + ).handle_error( + crimson::stateful_ec::handle([] (const auto& ec) { + crimson::get_logger( + ceph_subsys_test + ).error( + "error mounting object store in {}: ({}) {}", + crimson::common::local_conf().get_val("osd_data"), + ec.value(), + ec.message()); + std::exit(EXIT_FAILURE); + })); }).then([this] { return seastar::do_for_each( boost::counting_iterator(0), @@ -231,7 +242,18 @@ seastar::future<> FSDriver::mount() init(); return fs->start(); }).then([this] { - return fs->mount(); + return fs->mount( + ).handle_error( + crimson::stateful_ec::handle([] (const auto& ec) { + crimson::get_logger( + ceph_subsys_test + ).error( + "error mounting object store in {}: ({}) {}", + crimson::common::local_conf().get_val("osd_data"), + ec.value(), + ec.message()); + std::exit(EXIT_FAILURE); + })); }).then([this] { return seastar::do_for_each( boost::counting_iterator(0), -- 2.39.5