crimson/osd: Verbose assert_all aborts

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

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index e97525f9ad13bf3da31a4374c4ac9b108ac1d06b..c1a830410315d901acd9f2e30fa5e94f6f9fd118 100644 (file)
--- a/src/crimson/osd/osd_operations/client_request.cc
+++ b/src/crimson/osd/osd_operations/client_request.cc
@@ -316,7 +316,7 @@ ClientRequest::recover_missing_snaps(
     }
     return seastar::now();
   }).handle_error_interruptible(
-    crimson::ct_error::assert_all("unexpected error")
+    crimson::ct_error::assert_all(fmt::format("{} {} error", *pg, FNAME).c_str())
   );
   co_await std::move(resolve_oids);
 

diff --git a/src/crimson/osd/osd_operations/internal_client_request.cc b/src/crimson/osd/osd_operations/internal_client_request.cc
index b8f7646bc7433659ced647d737f5ca85bd709516..dc59189a823f997c112d973316b30bb06b1aed3b 100644 (file)
--- a/src/crimson/osd/osd_operations/internal_client_request.cc
+++ b/src/crimson/osd/osd_operations/internal_client_request.cc
@@ -86,7 +86,8 @@ InternalClientRequest::with_interruption()
   co_await pg->obc_loader.load_and_lock(
     obc_manager, pg->get_lock_type(op_info)
   ).handle_error_interruptible(
-    crimson::ct_error::assert_all("unexpected error")
+    crimson::ct_error::assert_all(
+      fmt::format("{} {} {} error when loading {}",*pg, FNAME, *this, get_target_oid()).c_str())
   );
 
   auto params = get_do_osd_ops_params();
@@ -96,12 +97,8 @@ InternalClientRequest::with_interruption()
   co_await pg->run_executer(
     ox, obc_manager.get_obc(), op_info, osd_ops
   ).handle_error_interruptible(
-    crimson::ct_error::all_same_way(
-      [this, FNAME](auto e) {
-       ERRORDPPI("{}: got unexpected error {}", *pg, *this, e);
-       ceph_assert(0 == "should not return an error");
-       return interruptor::now();
-      })
+    crimson::ct_error::assert_all(
+      fmt::format("{} {} {}: got unexpected error {}", *pg, FNAME, *this, get_target_oid()).c_str())
   );
 
   auto [submitted, completed] = co_await pg->submit_executer(

diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc
index f8fb7aef6f26ef4fb7df5ff0ee4490fdf9a624f2..1a4f67dd760a42801b1181571a346d576fbca225 100644 (file)
--- a/src/crimson/osd/osd_operations/snaptrim_event.cc
+++ b/src/crimson/osd/osd_operations/snaptrim_event.cc
@@ -412,7 +412,8 @@ SnapTrimObjSubEvent::start()
     obc_manager, RWState::RWWRITE
   ).handle_error_interruptible(
     remove_or_update_iertr::pass_further{},
-    crimson::ct_error::assert_all{"unexpected error in SnapTrimObjSubEvent"}
+    crimson::ct_error::assert_all{fmt::format(
+      "{} error SnapTrimObjSubEvent::snap_trim_obj_subevent_ret_t with {}", *this, coid).c_str()}
   );
 
   logger().debug("{}: got obc={}", *this, obc_manager.get_obc()->get_oid());

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index cb0689d2e31eb029160d37b2cd3a36f6a75849f6..c440e7f422894ccf4172a887c582cb4f4afbc969 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -730,7 +730,8 @@ seastar::future<> PG::init(
         t.touch(coll_ref->get_cid(), pgid.make_snapmapper_oid());
       }
     },
-    ::crimson::ct_error::assert_all{"unexpected eio"}
+    ::crimson::ct_error::assert_all{fmt::format(
+      "{} {} unexpected eio", *this, __func__).c_str()}
   );
 }
 

diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc
index 79895de06de04663710228d23637709c556358d7..42f5f82420218d97c9ad7ad875aa6d3e1eac1e03 100644 (file)
--- a/src/crimson/osd/pg_backend.cc
+++ b/src/crimson/osd/pg_backend.cc
@@ -1759,8 +1759,9 @@ PGBackend::tmapup_iertr::future<> PGBackend::tmapup(
       return seastar::make_ready_future<bufferlist>();
     }),
     PGBackend::write_iertr::pass_further{},
-    crimson::ct_error::assert_all{"read error in mutate_object_contents"}
-  ).si_then([this, &os, &osd_op, &txn,
+    crimson::ct_error::assert_all{fmt::format(
+      "read error in mutate_object_contents of {}", os.oi.soid).c_str()
+    }).si_then([this, &os, &osd_op, &txn,
             &delta_stats, &osd_op_params]
            (auto &&bl) mutable -> PGBackend::tmapup_iertr::future<> {
     auto result = crimson::common::do_tmap_up(

diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc
index f30d34195aa25fa1ec3693de543dfff00cf5262d..add728a62e5a3eebffaf43be645cc30676964d61 100644 (file)
--- a/src/crimson/osd/recovery_backend.cc
+++ b/src/crimson/osd/recovery_backend.cc
@@ -246,7 +246,7 @@ RecoveryBackend::scan_for_backfill(
       crimson::ct_error::enoent::handle([](auto) {
        return false;
       }),
-      crimson::ct_error::assert_all("unexpected error")
+      crimson::ct_error::assert_all(fmt::format("{} {} error when loading obc", pg, FNAME).c_str())
     );
     if (!found) {
       // if the object does not exist here, it must have been removed

diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 9b40edbfc6dd1cd2e7ff1bc1d3d17d8f9c7ea65c..27d841dfb19ede27f387a28d1921af2210221f4b 100644 (file)
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -153,7 +153,8 @@ ReplicatedRecoveryBackend::maybe_pull_missing_obj(
       return recovery_waiter.wait_for_pull();
     });
   }).handle_error_interruptible(
-    crimson::ct_error::assert_all("unexpected error")
+    crimson::ct_error::assert_all(fmt::format(
+      "{} {} error with {} need {} ", pg, FNAME, soid, need).c_str())
   );
 }
 
@@ -746,7 +747,8 @@ ReplicatedRecoveryBackend::read_omap_for_push_op(
       return seastar::make_ready_future<seastar::stop_iteration>(
         stop ? seastar::stop_iteration::yes : seastar::stop_iteration::no
       );
-    }, crimson::os::FuturizedStore::Shard::read_errorator::assert_all{});
+    }, crimson::os::FuturizedStore::Shard::read_errorator::assert_all(fmt::format(
+         "{} ReplicatedRecoveryBackend::read_omap_for_push_op error with {}", pg, oid).c_str()));
   });
 }