crimson: remove any assert_failure pre assert usages

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/crimson/os/cyanstore/cyan_store.h b/src/crimson/os/cyanstore/cyan_store.h
index 1d481ef5829a7d0ae81b45ac37a0729e6e9aa921..93d0d1443119877aaae18921d93ea54d2a2894e6 100644 (file)
--- a/src/crimson/os/cyanstore/cyan_store.h
+++ b/src/crimson/os/cyanstore/cyan_store.h
@@ -194,11 +194,8 @@ public:
     return shard_stores.invoke_on_all(
       [](auto &local_store) {
       return local_store.mount().handle_error(
-      crimson::stateful_ec::assert_failure([](const auto& ec) {
-        crimson::get_logger(ceph_subsys_cyanstore).error(
-           "error mounting cyanstore: ({}) {}",
-            ec.value(), ec.message());
-      }));
+      crimson::stateful_ec::assert_failure(
+        fmt::format("error mounting cyanstore").c_str()));
     });
   }
 

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc
index 28064800a32ff2c80f001e99432fd72542719bf4..d227d69afd34a6cad9d358278737a437682aa054 100644 (file)
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc
@@ -428,9 +428,8 @@ eagain_ifuture<Ref<Node>> Node::load_root(context_t c, RootNodeTracker& root_tra
   return c.nm.get_super(c.t, root_tracker
   ).handle_error_interruptible(
     eagain_iertr::pass_further{},
-    crimson::ct_error::input_output_error::assert_failure([FNAME, c] {
-      ERRORT("EIO during get_super()", c.t);
-    })
+    crimson::ct_error::input_output_error::assert_failure(fmt::format(
+        "{} EIO during get_super()", FNAME).c_str())
   ).si_then([c, &root_tracker, FNAME](auto&& _super) {
     assert(_super);
     auto root_addr = _super->get_root_laddr();
@@ -691,26 +690,8 @@ eagain_ifuture<Ref<Node>> Node::load(
   return c.nm.read_extent(c.t, addr
   ).handle_error_interruptible(
     eagain_iertr::pass_further{},
-    crimson::ct_error::input_output_error::assert_failure(
-        [FNAME, c, addr, expect_is_level_tail] {
-      ERRORT("EIO -- addr={}, is_level_tail={}",
-             c.t, addr, expect_is_level_tail);
-    }),
-    crimson::ct_error::invarg::assert_failure(
-        [FNAME, c, addr, expect_is_level_tail] {
-      ERRORT("EINVAL -- addr={}, is_level_tail={}",
-             c.t, addr, expect_is_level_tail);
-    }),
-    crimson::ct_error::enoent::assert_failure(
-        [FNAME, c, addr, expect_is_level_tail] {
-      ERRORT("ENOENT -- addr={}, is_level_tail={}",
-             c.t, addr, expect_is_level_tail);
-    }),
-    crimson::ct_error::erange::assert_failure(
-        [FNAME, c, addr, expect_is_level_tail] {
-      ERRORT("ERANGE -- addr={}, is_level_tail={}",
-             c.t, addr, expect_is_level_tail);
-    })
+    crimson::ct_error::assert_all(fmt::format(
+      "{} -- addr={}, is_level_tail={}", FNAME, addr, expect_is_level_tail).c_str())
   ).si_then([FNAME, c, addr, expect_is_level_tail](auto extent)
              -> eagain_ifuture<Ref<Node>> {
     assert(extent);
@@ -2145,9 +2126,8 @@ eagain_ifuture<Ref<LeafNode>> LeafNode::allocate_root(
     return c.nm.get_super(c.t, root_tracker
     ).handle_error_interruptible(
       eagain_iertr::pass_further{},
-      crimson::ct_error::input_output_error::assert_failure([FNAME, c] {
-        ERRORT("EIO during get_super()", c.t);
-      })
+      crimson::ct_error::input_output_error::assert_failure(fmt::format(
+        "{} EIO during get_super()", FNAME).c_str())
     ).si_then([c, root](auto&& super) {
       assert(super);
       root->make_root_new(c, std::move(super));

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
index f178d998ca6583d73f06987ca2f9226dcdb7cef9..14cd2ef3a8db1038d50005e1a4884c32187e7cf2 100644 (file)
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
@@ -523,12 +523,9 @@ class NodeExtentAccessorT {
     return c.nm.alloc_extent(c.t, hint, alloc_size
     ).handle_error_interruptible(
       eagain_iertr::pass_further{},
-      crimson::ct_error::input_output_error::assert_failure(
-          [FNAME, c, alloc_size, l_to_discard = extent->get_laddr()] {
-        SUBERRORT(seastore_onode,
-            "EIO during allocate -- node_size={}, to_discard={}",
-            c.t, alloc_size, l_to_discard);
-      })
+      crimson::ct_error::input_output_error::assert_failure(fmt::format(
+        "{} during allocate -- node_size={}, to_discard={}",
+        FNAME, alloc_size, extent->get_laddr()).c_str())
     ).si_then([this, c, FNAME] (auto fresh_extent) {
       SUBDEBUGT(seastore_onode,
           "update addr from {} to {} ...",
@@ -551,20 +548,9 @@ class NodeExtentAccessorT {
       return c.nm.retire_extent(c.t, to_discard
       ).handle_error_interruptible(
         eagain_iertr::pass_further{},
-        crimson::ct_error::input_output_error::assert_failure(
-            [FNAME, c, l_to_discard = to_discard->get_laddr(),
-             l_fresh = fresh_extent->get_laddr()] {
-          SUBERRORT(seastore_onode,
-              "EIO during retire -- to_disgard={}, fresh={}",
-              c.t, l_to_discard, l_fresh);
-        }),
-        crimson::ct_error::enoent::assert_failure(
-            [FNAME, c, l_to_discard = to_discard->get_laddr(),
-             l_fresh = fresh_extent->get_laddr()] {
-          SUBERRORT(seastore_onode,
-              "ENOENT during retire -- to_disgard={}, fresh={}",
-              c.t, l_to_discard, l_fresh);
-        })
+        crimson::ct_error::assert_all(fmt::format(
+          "{} during retire -- to_disgard={}, fresh={}",
+          FNAME, to_discard->get_laddr(), fresh_extent->get_laddr()).c_str())
       );
     }).si_then([this, c] {
       boost::ignore_unused(c);  // avoid clang warning;
@@ -580,14 +566,8 @@ class NodeExtentAccessorT {
     return c.nm.retire_extent(c.t, std::move(extent)
     ).handle_error_interruptible(
       eagain_iertr::pass_further{},
-      crimson::ct_error::input_output_error::assert_failure(
-          [FNAME, c, addr] {
-        SUBERRORT(seastore_onode, "EIO -- addr={}", c.t, addr);
-      }),
-      crimson::ct_error::enoent::assert_failure(
-          [FNAME, c, addr] {
-        SUBERRORT(seastore_onode, "ENOENT -- addr={}", c.t, addr);
-      })
+      crimson::ct_error::assert_all(fmt::format(
+        "{} addr={}", FNAME, addr).c_str())
 #ifndef NDEBUG
     ).si_then([c] {
       assert(!c.t.is_conflicted());

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h
index 397a014a7c3d2ba1654d3db19ae74217114588da..8ad780040789ea7126780206c624f111e5144080 100644 (file)
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h
@@ -78,12 +78,9 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl {
     return c.nm.alloc_extent(c.t, hint, extent_size
     ).handle_error_interruptible(
       eagain_iertr::pass_further{},
-      crimson::ct_error::input_output_error::assert_failure(
-          [FNAME, c, extent_size, is_level_tail, level] {
-        SUBERRORT(seastore_onode,
-            "EIO -- extent_size={}, is_level_tail={}, level={}",
-            c.t, extent_size, is_level_tail, level);
-      })
+      crimson::ct_error::input_output_error::assert_failure(fmt::format(
+        "{} extent_size={}, is_level_tail={}, level={}",
+        FNAME, extent_size, is_level_tail, level).c_str())
     ).si_then([is_level_tail, level](auto extent) {
       assert(extent);
       assert(extent->is_initial_pending());

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 96529b707982808b0eb933a0753239c7ef1ea8ca..57227eaa66d6c62343585cde461ebd85bcf2c3ad 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -280,18 +280,16 @@ seastar::future<> OSD::mkfs(
   co_await store.start();
 
   co_await store.mkfs(osd_uuid).handle_error(
-    crimson::stateful_ec::assert_failure([FNAME] (const auto& ec) {
-      ERROR("error creating empty object store in {}: ({}) {}",
-           local_conf().get_val<std::string>("osd_data"),
-           ec.value(), ec.message());
-    }));
+    crimson::stateful_ec::assert_failure(fmt::format(
+      "{} error creating empty object store in {}",
+       FNAME, local_conf().get_val<std::string>("osd_data")).c_str())
+  );
 
   co_await store.mount().handle_error(
-    crimson::stateful_ec::assert_failure([FNAME](const auto& ec) {
-      ERROR("error mounting object store in {}: ({}) {}",
-           local_conf().get_val<std::string>("osd_data"),
-           ec.value(), ec.message());
-    }));
+    crimson::stateful_ec::assert_failure(fmt::format(
+      "{} error mounting object store in {}",
+      FNAME, local_conf().get_val<std::string>("osd_data")).c_str())
+  );
 
   {
     auto meta_coll = co_await open_or_create_meta_coll(store);
@@ -477,11 +475,10 @@ seastar::future<> OSD::start()
        whoami, get_shard_services(),
        *monc, *hb_front_msgr, *hb_back_msgr});
     return store.mount().handle_error(
-      crimson::stateful_ec::assert_failure([FNAME] (const auto& ec) {
-        ERROR("error mounting object store in {}: ({}) {}",
-             local_conf().get_val<std::string>("osd_data"),
-             ec.value(), ec.message());
-      }));
+      crimson::stateful_ec::assert_failure(fmt::format(
+        "{} error mounting object store in {}",
+        FNAME, local_conf().get_val<std::string>("osd_data")).c_str())
+    );
   }).then([this, FNAME] {
     auto stats_seconds = local_conf().get_val<int64_t>("crimson_osd_stat_interval");
     if (stats_seconds > 0) {

diff --git a/src/crimson/tools/store_nbd/fs_driver.cc b/src/crimson/tools/store_nbd/fs_driver.cc
index e0c7a5c8f0789da759c6bf5c7ef696e937a76990..5f6af06ce50cd36e9de40133e87f9f22665cae7c 100644 (file)
--- a/src/crimson/tools/store_nbd/fs_driver.cc
+++ b/src/crimson/tools/store_nbd/fs_driver.cc
@@ -185,12 +185,10 @@ seastar::future<> FSDriver::mkfs()
     uuid_d uuid;
     uuid.generate_random();
     return fs->mkfs(uuid).handle_error(
-      crimson::stateful_ec::assert_failure([] (const auto& ec) {
-        crimson::get_logger(ceph_subsys_test)
-          .error("error creating empty object store in {}: ({}) {}",
-          crimson::common::local_conf().get_val<std::string>("osd_data"),
-          ec.value(), ec.message());
-      }));
+      crimson::stateful_ec::assert_failure(fmt::format(
+        "error creating empty object store in {}",
+        crimson::common::local_conf().get_val<std::string>("osd_data")).c_str())
+);
   }).then([this] {
     return fs->stop();
   }).then([this] {
@@ -198,15 +196,10 @@ seastar::future<> FSDriver::mkfs()
   }).then([this] {
     return fs->mount(
     ).handle_error(
-      crimson::stateful_ec::assert_failure([] (const auto& ec) {
-        crimson::get_logger(
-         ceph_subsys_test
-       ).error(
-         "error mounting object store in {}: ({}) {}",
-         crimson::common::local_conf().get_val<std::string>("osd_data"),
-         ec.value(),
-         ec.message());
-      }));
+      crimson::stateful_ec::assert_failure(fmt::format(
+        "error creating empty object store in {}",
+        crimson::common::local_conf().get_val<std::string>("osd_data")).c_str())
+    );
   }).then([this] {
     return seastar::do_for_each(
       boost::counting_iterator<unsigned>(0),
@@ -239,15 +232,10 @@ seastar::future<> FSDriver::mount()
   }).then([this] {
     return fs->mount(
     ).handle_error(
-      crimson::stateful_ec::assert_failure([] (const auto& ec) {
-        crimson::get_logger(
-         ceph_subsys_test
-       ).error(
-         "error mounting object store in {}: ({}) {}",
-         crimson::common::local_conf().get_val<std::string>("osd_data"),
-         ec.value(),
-         ec.message());
-      }));
+      crimson::stateful_ec::assert_failure(fmt::format(
+        "error creating empty object store in {}",
+        crimson::common::local_conf().get_val<std::string>("osd_data")).c_str())
+    );
   }).then([this] {
     return seastar::do_for_each(
       boost::counting_iterator<unsigned>(0),