From 344cbd54e04bf5699037ae1de1701cb210950d5b Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Mon, 30 Jun 2025 09:44:24 +0000 Subject: [PATCH] crimson: switch to ceph_abort_msg ceph_abort doesn't print a message. Use ceph_abort_msg instead. Most of the instances are not printing useful information but some are: ceph_abort_msg("seastore device size setting is too small"); ``` ::ceph::__ceph_abort( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, "abort() called") ::ceph::__ceph_abort( __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, msg) ``` Signed-off-by: Matan Breizman --- src/crimson/net/FrameAssemblerV2.cc | 2 +- src/crimson/net/Interceptor.h | 2 +- src/crimson/net/ProtocolV2.cc | 6 +-- src/crimson/net/Socket.cc | 4 +- src/crimson/net/io_handler.cc | 4 +- src/crimson/net/io_handler.h | 2 +- src/crimson/os/seastore/async_cleaner.cc | 4 +- .../seastore/backref/btree_backref_manager.cc | 2 +- .../os/seastore/btree/fixed_kv_btree.h | 4 +- src/crimson/os/seastore/cache.cc | 8 ++-- src/crimson/os/seastore/cache.h | 4 +- src/crimson/os/seastore/cached_extent.h | 12 +++--- .../os/seastore/extent_placement_manager.cc | 2 +- .../os/seastore/extent_placement_manager.h | 2 +- .../journal/circular_journal_space.cc | 2 +- .../os/seastore/journal/record_submitter.cc | 2 +- .../os/seastore/object_data_handler.cc | 4 +- .../onode_manager/staged-fltree/node.cc | 22 +++++------ .../onode_manager/staged-fltree/node.h | 4 +- .../staged-fltree/node_extent_accessor.h | 10 ++--- .../staged-fltree/node_extent_manager/dummy.h | 8 ++-- .../node_extent_manager/seastore.cc | 8 ++-- .../node_extent_manager/seastore.h | 2 +- .../node_extent_manager/test_replay.h | 10 ++--- .../onode_manager/staged-fltree/node_impl.cc | 8 ++-- .../onode_manager/staged-fltree/node_impl.h | 28 +++++++------- .../onode_manager/staged-fltree/node_layout.h | 20 +++++----- .../staged-fltree/node_layout_replayable.h | 2 +- .../staged-fltree/stages/key_layout.cc | 2 +- .../staged-fltree/stages/key_layout.h | 2 +- .../staged-fltree/stages/node_stage.cc | 30 +++++++-------- .../staged-fltree/stages/node_stage.h | 6 +-- .../staged-fltree/stages/node_stage_layout.h | 8 ++-- .../staged-fltree/stages/stage.h | 38 +++++++++---------- .../staged-fltree/stages/stage_types.h | 8 ++-- .../onode_manager/staged-fltree/tree.h | 4 +- src/crimson/os/seastore/transaction_manager.h | 4 +- src/crimson/osd/pg_map.cc | 16 ++++---- src/crimson/osd/recovery_backend.cc | 2 +- src/crimson/osd/scrub/scrub_machine.h | 2 +- src/crimson/osd/shard_services.cc | 2 +- src/crimson/tools/perf_crimson_msgr.cc | 2 +- 42 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/crimson/net/FrameAssemblerV2.cc b/src/crimson/net/FrameAssemblerV2.cc index d2add814d3787..89600742ec593 100644 --- a/src/crimson/net/FrameAssemblerV2.cc +++ b/src/crimson/net/FrameAssemblerV2.cc @@ -427,7 +427,7 @@ FrameAssemblerV2::read_frame_payload() // and abort after putting entire data field on wire. This will be used by // the kernel client to avoid unnecessary buffering. if (!ok) { - ceph_abort("TODO"); + ceph_abort_msg("TODO"); } return &rx_segments_data; }); diff --git a/src/crimson/net/Interceptor.h b/src/crimson/net/Interceptor.h index 35b74e24369c4..36b48a51ff7de 100644 --- a/src/crimson/net/Interceptor.h +++ b/src/crimson/net/Interceptor.h @@ -79,7 +79,7 @@ class socket_blocker { return seastar::sleep_abortable( std::chrono::seconds(10), *p_unblocked ).then([] { - ceph_abort("Timeout (10s) in socket_blocker::block()"); + ceph_abort_msg("Timeout (10s) in socket_blocker::block()"); }).handle_exception_type([] (const seastar::sleep_aborted& e) { // wait done! }); diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc index 7942adc7ef183..6f4b2c6d00abe 100644 --- a/src/crimson/net/ProtocolV2.cc +++ b/src/crimson/net/ProtocolV2.cc @@ -908,7 +908,7 @@ void ProtocolV2::execute_connecting() logger().info("[Test] got BLOCK"); return conn.interceptor->blocker.block(); default: - ceph_abort("unexpected action from trap"); + ceph_abort_msg("unexpected action from trap"); return seastar::now(); } });; @@ -1041,7 +1041,7 @@ void ProtocolV2::execute_connecting() return seastar::now(); } default: { - ceph_abort("impossible next step"); + ceph_abort_msg("impossible next step"); } } }).handle_exception([this](std::exception_ptr eptr) { @@ -1693,7 +1693,7 @@ void ProtocolV2::execute_accepting() execute_server_wait(); break; default: - ceph_abort("impossible next step"); + ceph_abort_msg("impossible next step"); } }).handle_exception([this](std::exception_ptr eptr) { const char *e_what; diff --git a/src/crimson/net/Socket.cc b/src/crimson/net/Socket.cc index 3a7aeaf9651e2..97e0bee4dc3c8 100644 --- a/src/crimson/net/Socket.cc +++ b/src/crimson/net/Socket.cc @@ -332,7 +332,7 @@ Socket::try_trap_pre(bp_action_t& trap) { trap = action; break; default: - ceph_abort("unexpected action from trap"); + ceph_abort_msg("unexpected action from trap"); } return seastar::make_ready_future<>(); } @@ -349,7 +349,7 @@ Socket::try_trap_post(bp_action_t& trap) { force_shutdown(); return blocker->block(); default: - ceph_abort("unexpected action from trap"); + ceph_abort_msg("unexpected action from trap"); } return seastar::make_ready_future<>(); } diff --git a/src/crimson/net/io_handler.cc b/src/crimson/net/io_handler.cc index acd6147710b5b..54ea30093bf7c 100644 --- a/src/crimson/net/io_handler.cc +++ b/src/crimson/net/io_handler.cc @@ -912,7 +912,7 @@ IOHandler::do_out_dispatch(shard_states_t &ctx) ctx.exit_out_dispatching("switched", conn); return seastar::make_ready_future(stop_t::yes); default: - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } }).handle_exception_type([this, &ctx](const std::system_error& e) { auto io_state = ctx.get_io_state(); @@ -1130,7 +1130,7 @@ void IOHandler::do_in_dispatch() return seastar::now(); } // TODO: message throttler - ceph_abort("TODO"); + ceph_abort_msg("TODO"); return seastar::now(); }).then([this, msg_size] { // throttle_bytes() logic diff --git a/src/crimson/net/io_handler.h b/src/crimson/net/io_handler.h index c64e7a0f6526c..d26fe9a95dbdf 100644 --- a/src/crimson/net/io_handler.h +++ b/src/crimson/net/io_handler.h @@ -329,7 +329,7 @@ public: crimson::get_logger(ceph_subsys_ms).error( "{} try_enter_out_dispatching() got wrong io_state {}", conn, io_state); - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc index d6508a6b63e07..bc1d19afd48b6 100644 --- a/src/crimson/os/seastore/async_cleaner.cc +++ b/src/crimson/os/seastore/async_cleaner.cc @@ -1075,7 +1075,7 @@ segment_id_t SegmentCleaner::allocate_segment( ERROR("out of space with {} {} {} {}", type, segment_seq_printer_t{seq}, category, rewrite_gen_printer_t{generation}); - ceph_abort("seastore device size setting is too small"); + ceph_abort_msg("seastore device size setting is too small"); return NULL_SEG_ID; } @@ -1703,7 +1703,7 @@ segment_id_t SegmentCleaner::get_next_reclaim_segment() const } else { ceph_assert(get_segments_reclaimable() == 0); // see should_clean_space() - ceph_abort("impossible!"); + ceph_abort_msg("impossible!"); return NULL_SEG_ID; } } diff --git a/src/crimson/os/seastore/backref/btree_backref_manager.cc b/src/crimson/os/seastore/backref/btree_backref_manager.cc index 58b4ffd4c9a84..3a9875cf5f841 100644 --- a/src/crimson/os/seastore/backref/btree_backref_manager.cc +++ b/src/crimson/os/seastore/backref/btree_backref_manager.cc @@ -216,7 +216,7 @@ BtreeBackrefManager::new_mapping( t, addr, len, key, pos.get_key(), pos.get_val().len, pos.get_val()); - ceph_abort("not possible for the backref tree"); + ceph_abort_msg("not possible for the backref tree"); return BackrefBtree::iterate_repeat_ret_inner( interruptible::ready_future_marker{}, seastar::stop_iteration::no); diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h index 1390cf63bc8c0..3dceaddef8131 100644 --- a/src/crimson/os/seastore/btree/fixed_kv_btree.h +++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h @@ -529,7 +529,7 @@ public: } } else { ceph_assert(!child_node->is_valid()); - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } else if (ret == Transaction::get_extent_ret::ABSENT) { BaseChildNode, @@ -573,7 +573,7 @@ public: i->get_key()))); } } else { - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } } diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc index deb47dcac671d..a639d83a78bdb 100644 --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@ -1237,7 +1237,7 @@ record_t Cache::prepare_record( if (!i.ref->is_valid()) { SUBERRORT(seastore_t, "read_set got invalid extent, aborting -- {}", t, *i.ref); - ceph_abort("no invalid extent allowed in transactions' read_set"); + ceph_abort_msg("no invalid extent allowed in transactions' read_set"); } get_by_ext(efforts.read_by_ext, i.ref->get_type()).increment(i.ref->get_length()); @@ -1424,7 +1424,7 @@ record_t Cache::prepare_record( remove_backref_extent(extent->get_paddr()); } else { ERRORT("Got unexpected extent type: {}", t, *extent); - ceph_abort("imposible"); + ceph_abort_msg("imposible"); } } alloc_deltas.emplace_back(std::move(rel_delta)); @@ -1642,7 +1642,7 @@ record_t Cache::prepare_record( SUBINFOT(seastore_t, "alloc_tail all trimmed, set to head {}, src={}", t, alloc_tail, trans_src); } else if (*maybe_alloc_tail == JOURNAL_SEQ_NULL) { - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } else { alloc_tail = *maybe_alloc_tail; } @@ -1859,7 +1859,7 @@ void Cache::complete_commit( i->get_type()); } else { ERRORT("{}", t, *i); - ceph_abort("not possible"); + ceph_abort_msg("not possible"); } }); diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index e7a78fe238327..42d4a4a28d3b3 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -338,7 +338,7 @@ public: if (result == Transaction::get_extent_ret::RETIRED) { SUBERRORT(seastore_cache, "{} {}~0x{:x} is retired on t -- {}", t, T::TYPE, offset, length, *ret); - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } else if (result == Transaction::get_extent_ret::PRESENT) { assert(ret->get_length() == length); if (ret->is_fully_loaded()) { @@ -847,7 +847,7 @@ private: if (status == Transaction::get_extent_ret::RETIRED) { SUBERRORT(seastore_cache, "{} {}~0x{:x} {} is retired on t -- {}", t, type, offset, length, laddr, *ret); - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } else if (status == Transaction::get_extent_ret::PRESENT) { assert(ret->get_length() == length); if (ret->is_fully_loaded()) { diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h index fe25c7481a582..10c4aa704c810 100644 --- a/src/crimson/os/seastore/cached_extent.h +++ b/src/crimson/os/seastore/cached_extent.h @@ -1345,12 +1345,12 @@ public: : CachedExtent(CachedExtent::retired_placeholder_construct_t{}, length) {} CachedExtentRef duplicate_for_write(Transaction&) final { - ceph_abort("Should never happen for a placeholder"); + ceph_abort_msg("Should never happen for a placeholder"); return CachedExtentRef(); } ceph::bufferlist get_delta() final { - ceph_abort("Should never happen for a placeholder"); + ceph_abort_msg("Should never happen for a placeholder"); return ceph::bufferlist(); } @@ -1361,7 +1361,7 @@ public: void apply_delta_and_adjust_crc( paddr_t base, const ceph::bufferlist &bl) final { - ceph_abort("Should never happen for a placeholder"); + ceph_abort_msg("Should never happen for a placeholder"); } void on_rewrite(Transaction &, CachedExtent&, extent_len_t) final {} @@ -1371,7 +1371,7 @@ public: } void on_delta_write(paddr_t record_block_offset) final { - ceph_abort("Should never happen for a placeholder"); + ceph_abort_msg("Should never happen for a placeholder"); } }; @@ -1449,12 +1449,12 @@ public: extent_len_t len; }; virtual std::optional get_modified_region() { - ceph_abort("Unsupported"); + ceph_abort_msg("Unsupported"); return std::nullopt; } virtual void clear_modified_region() { - ceph_abort("Unsupported"); + ceph_abort_msg("Unsupported"); } virtual ~LogicalCachedExtent() {} diff --git a/src/crimson/os/seastore/extent_placement_manager.cc b/src/crimson/os/seastore/extent_placement_manager.cc index fd19eeb7e58eb..457cd1cf1dcf7 100644 --- a/src/crimson/os/seastore/extent_placement_manager.cc +++ b/src/crimson/os/seastore/extent_placement_manager.cc @@ -915,7 +915,7 @@ ExtentPlacementManager::BackgroundProcess::do_background_cycle() } if (!proceed_clean_main && !proceed_clean_cold) { - ceph_abort("no background process will start"); + ceph_abort_msg("no background process will start"); } return seastar::when_all( [this, FNAME, proceed_clean_main, diff --git a/src/crimson/os/seastore/extent_placement_manager.h b/src/crimson/os/seastore/extent_placement_manager.h index bcfe98811b77e..913e95ab647ef 100644 --- a/src/crimson/os/seastore/extent_placement_manager.h +++ b/src/crimson/os/seastore/extent_placement_manager.h @@ -1000,7 +1000,7 @@ private: } break; default: - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } return ret; } diff --git a/src/crimson/os/seastore/journal/circular_journal_space.cc b/src/crimson/os/seastore/journal/circular_journal_space.cc index 458042ee36a2c..29095abf9c34e 100644 --- a/src/crimson/os/seastore/journal/circular_journal_space.cc +++ b/src/crimson/os/seastore/journal/circular_journal_space.cc @@ -55,7 +55,7 @@ CircularJournalSpace::write(ceph::bufferlist&& to_write) { assert(get_written_to().segment_seq != NULL_SEG_SEQ); auto encoded_size = to_write.length(); if (encoded_size > get_records_available_size()) { - ceph_abort("should be impossible with EPM reservation"); + ceph_abort_msg("should be impossible with EPM reservation"); } assert(encoded_size + get_rbm_addr(get_written_to()) < get_journal_end()); diff --git a/src/crimson/os/seastore/journal/record_submitter.cc b/src/crimson/os/seastore/journal/record_submitter.cc index 4976eee96e714..0ae4e25b21788 100644 --- a/src/crimson/os/seastore/journal/record_submitter.cc +++ b/src/crimson/os/seastore/journal/record_submitter.cc @@ -469,7 +469,7 @@ void RecordSubmitter::update_state() } else if (num_outstanding_io == io_depth_limit) { state = state_t::FULL; } else { - ceph_abort("fatal error: io-depth overflow"); + ceph_abort_msg("fatal error: io-depth overflow"); } } diff --git a/src/crimson/os/seastore/object_data_handler.cc b/src/crimson/os/seastore/object_data_handler.cc index 386ee317051ad..bdfff46991889 100644 --- a/src/crimson/os/seastore/object_data_handler.cc +++ b/src/crimson/os/seastore/object_data_handler.cc @@ -489,7 +489,7 @@ ObjectDataHandler::write_ret do_remappings( return ObjectDataHandler::write_iertr::now(); }); } else { - ceph_abort("impossible"); + ceph_abort_msg("impossible"); return ObjectDataHandler::write_iertr::now(); } }); @@ -585,7 +585,7 @@ ObjectDataHandler::write_ret do_insertions( ObjectDataHandler::write_iertr::pass_further{} ); } else { - ceph_abort("impossible"); + ceph_abort_msg("impossible"); return ObjectDataHandler::write_iertr::now(); } }); 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 d227d69afd34a..04095a4e5e398 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node.cc @@ -93,7 +93,7 @@ void tree_cursor_t::assert_next_to( } } else { assert(is_invalid()); - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } #endif } @@ -240,7 +240,7 @@ void tree_cursor_t::Cache::maybe_duplicate(const node_version_t& current_version p_node_base = current_p_node_base; } else { // It is impossible to change state backwards, see node_types.h. - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } @@ -701,13 +701,13 @@ eagain_ifuture> Node::load( ERRORT("load addr={}, is_level_tail={} error, " "got invalid header -- {}", c.t, addr, expect_is_level_tail, fmt::ptr(extent)); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } if (header.get_is_level_tail() != expect_is_level_tail) { ERRORT("load addr={}, is_level_tail={} error, " "is_level_tail mismatch -- {}", c.t, addr, expect_is_level_tail, fmt::ptr(extent)); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } auto node_type = header.get_node_type(); @@ -716,7 +716,7 @@ eagain_ifuture> Node::load( ERRORT("load addr={}, is_level_tail={} error, " "leaf length mismatch -- {}", c.t, addr, expect_is_level_tail, fmt::ptr(extent)); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } auto impl = LeafNodeImpl::load(extent, *field_type); auto *derived_ptr = impl.get(); @@ -727,14 +727,14 @@ eagain_ifuture> Node::load( ERRORT("load addr={}, is_level_tail={} error, " "internal length mismatch -- {}", c.t, addr, expect_is_level_tail, fmt::ptr(extent)); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } auto impl = InternalNodeImpl::load(extent, *field_type); auto *derived_ptr = impl.get(); return eagain_iertr::make_ready_future>( new InternalNode(derived_ptr, std::move(impl))); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } }); } @@ -945,7 +945,7 @@ eagain_ifuture<> InternalNode::erase_child(context_t c, Ref&& child_ref) // // In order to preserve the invariant, we need to make sure the new // internal root also has at least 2 children. - ceph_abort("trying to erase the last item from the internal root node"); + ceph_abort_msg("trying to erase the last item from the internal root node"); } // track erase @@ -1568,7 +1568,7 @@ eagain_ifuture> InternalNode::get_or_track_child( if (child->level() + 1 != level()) { ERRORT("loaded child {} error from parent {} at pos({}), level mismatch", c.t, child->get_name(), get_name(), position); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } child->as_child(position, this); return child; @@ -1893,14 +1893,14 @@ LeafNode::erase(context_t, const search_position_t&, bool); eagain_ifuture<> LeafNode::extend_value( context_t c, const search_position_t& pos, value_size_t extend_size) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); return eagain_iertr::now(); } eagain_ifuture<> LeafNode::trim_value( context_t c, const search_position_t& pos, value_size_t trim_size) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); return eagain_iertr::now(); } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node.h index 0b764172e50e4..eff0e0a6f1a0a 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node.h @@ -284,7 +284,7 @@ class Node // good } else { assert(p_cursor->is_invalid()); - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } #endif @@ -383,7 +383,7 @@ class Node protected: virtual eagain_ifuture<> test_clone_non_root(context_t, Ref) const { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } virtual eagain_ifuture lower_bound_tracked( context_t, const key_hobj_t&, MatchHistory&) = 0; 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 d2f1ecda73e2e..cd8e14002dbdd 100644 --- 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 @@ -207,13 +207,13 @@ class DeltaRecorderT final: public DeltaRecorder { SUBERROR(seastore_onode, "got unknown op {} when replay {}", op, node); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } } catch (buffer::error& e) { SUBERROR(seastore_onode, "got decode error {} when replay {}", e.what(), node); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } } @@ -245,7 +245,7 @@ class DeltaRecorderT final: public DeltaRecorder { // NODE_TYPE == node_type_t::LEAF value.encode(encoded); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -259,7 +259,7 @@ class DeltaRecorderT final: public DeltaRecorder { // NODE_TYPE == node_type_t::LEAF return value_config_t::decode(delta); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -314,7 +314,7 @@ class NodeExtentAccessorT { recorder = nullptr; } else { // extent is invalid or retired - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #ifndef NDEBUG auto ref_recorder = recorder_t::create_for_replay(); diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/dummy.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/dummy.h index df2e5fe7503d7..86cb5c9588f17 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/dummy.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/dummy.h @@ -52,17 +52,17 @@ class DummyNodeExtent final: public NodeExtent { protected: NodeExtentRef mutate(context_t, DeltaRecorderURef&&) override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } DeltaRecorder* get_recorder() const override { return nullptr; } CachedExtentRef duplicate_for_write(Transaction&) override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } extent_types_t get_type() const override { return extent_types_t::TEST_BLOCK; } ceph::bufferlist get_delta() override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } void apply_delta(const ceph::bufferlist&) override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } }; template diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc index 3b52c5dc069c1..dc774330c9cdf 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.cc @@ -27,7 +27,7 @@ static DeltaRecorderURef create_replay_recorder( } else if (field_type == field_type_t::N3) { return DeltaRecorderT::create_for_replay(); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } else if (node_type == node_type_t::INTERNAL) { if (field_type == field_type_t::N0) { @@ -39,10 +39,10 @@ static DeltaRecorderURef create_replay_recorder( } else if (field_type == field_type_t::N3) { return DeltaRecorderT::create_for_replay(); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -68,7 +68,7 @@ void SeastoreNodeExtent::apply_delta(const ceph::bufferlist& bl) auto field_type = header.get_field_type(); if (!field_type.has_value()) { ERROR("replay got invalid node -- {}", *this); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } auto node_type = header.get_node_type(); recorder = create_replay_recorder(node_type, *field_type); diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h index ab25c312f9b8f..67eaee194b33a 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h @@ -146,7 +146,7 @@ class SeastoreNodeExtentManager final: public TransactionManagerHandle { SUBERRORT(seastore_onode, "allocated {}B but got invalid extent: {}", t, len, *extent); - ceph_abort("fatal error"); + ceph_abort_msg("fatal error"); } assert(extent->get_length() == len); std::ignore = len; diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/test_replay.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/test_replay.h index bce74e3814058..62e08da5f6adc 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/test_replay.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/test_replay.h @@ -44,17 +44,17 @@ class TestReplayExtent final: public NodeExtent { protected: NodeExtentRef mutate(context_t, DeltaRecorderURef&&) override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } DeltaRecorder* get_recorder() const override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } CachedExtentRef duplicate_for_write(Transaction&) override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } extent_types_t get_type() const override { return extent_types_t::TEST_BLOCK; } ceph::bufferlist get_delta() override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } void apply_delta(const ceph::bufferlist&) override { - ceph_abort("impossible path"); } + ceph_abort_msg("impossible path"); } private: TestReplayExtent(ceph::bufferptr&& ptr, DeltaRecorderURef&& recorder) diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.cc index 5db0f83dda616..ce6c9f5a9960e 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.cc @@ -24,7 +24,7 @@ InternalNodeImpl::allocate( } else if (type == field_type_t::N3) { return InternalNode3::allocate(c, hint, is_level_tail, level); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -41,7 +41,7 @@ LeafNodeImpl::allocate( } else if (type == field_type_t::N3) { return LeafNode3::allocate(c, hint, is_level_tail, 0); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -57,7 +57,7 @@ InternalNodeImplURef InternalNodeImpl::load( } else if (type == field_type_t::N3) { return InternalNode3::load(extent); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -73,7 +73,7 @@ LeafNodeImplURef LeafNodeImpl::load( } else if (type == field_type_t::N3) { return LeafNode3::load(extent); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.h index cf452618b6fa1..ccbb6690607d2 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_impl.h @@ -121,48 +121,48 @@ class InternalNodeImpl : public NodeImpl { virtual void get_slot(const search_position_t&, // IN key_view_t* = nullptr, // OUT const laddr_packed_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual void get_prev_slot(search_position_t&, // IN&OUT key_view_t* = nullptr, // OUT const laddr_packed_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual void get_next_slot(search_position_t&, // IN&OUT key_view_t* = nullptr, // OUT const laddr_packed_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual void get_largest_slot(search_position_t* = nullptr, // OUT key_view_t* = nullptr, // OUT const laddr_packed_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual lookup_result_t lower_bound( const key_hobj_t&, MatchHistory&, key_view_t* = nullptr, internal_marker_t = {}) const { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual const laddr_packed_t* insert( const key_view_t&, const laddr_t&, search_position_t&, match_stage_t&, node_offset_t&) { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual std::tuple split_insert( NodeExtentMutable&, NodeImpl&, const key_view_t&, const laddr_t&, search_position_t&, match_stage_t&, node_offset_t&) { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } virtual const laddr_packed_t* get_tail_value() const = 0; @@ -201,48 +201,48 @@ class LeafNodeImpl : public NodeImpl { virtual void get_slot(const search_position_t&, // IN key_view_t* = nullptr, // OUT const value_header_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual void get_prev_slot(search_position_t&, // IN&OUT key_view_t* = nullptr, // OUT const value_header_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual void get_next_slot(search_position_t&, // IN&OUT key_view_t* = nullptr, // OUT const value_header_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual void get_largest_slot(search_position_t* = nullptr, // OUT key_view_t* = nullptr, // OUT const value_header_t** = nullptr) const { // OUT - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual lookup_result_t lower_bound( const key_hobj_t&, MatchHistory&, key_view_t* = nullptr, leaf_marker_t = {}) const { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual const value_header_t* insert( const key_hobj_t&, const value_config_t&, search_position_t&, match_stage_t&, node_offset_t&) { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #pragma GCC diagnostic ignored "-Woverloaded-virtual" virtual std::tuple split_insert( NodeExtentMutable&, NodeImpl&, const key_hobj_t&, const value_config_t&, search_position_t&, match_stage_t&, node_offset_t&) { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } virtual std::tuple evaluate_insert( 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 8ad780040789e..70a2dcadc9f76 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout.h @@ -219,7 +219,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { merge_stage = STAGE; size_comp = right_node_stage.header_size(); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } else { key_view_t left_pivot_index; @@ -278,7 +278,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { auto p_write = left_node_stage.get_end_p_laddr(); mut.copy_in_absolute((void*)p_write, tail_value); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } else { typename stage_t::template StagedAppender left_appender; @@ -423,7 +423,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { stage_t::template get_slot( extent.read(), cast_down(pos), p_index_key, nullptr); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } #ifndef NDEBUG if (pp_value) { @@ -446,7 +446,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { stage_t::template get_prev_slot( extent.read(), _pos, nullptr, pp_value); } else { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } #ifndef NDEBUG auto _nxt_pos = _pos; @@ -469,7 +469,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { find_next = stage_t::template get_next_slot( extent.read(), cast_down(pos), nullptr, pp_value); } else { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } if (find_next) { pos = search_position_t::end(); @@ -493,7 +493,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { stage_t::template get_largest_slot( extent.read(), &cast_down_fill_0(*p_pos), nullptr, nullptr); } else { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } } @@ -834,7 +834,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { assert(is_level_tail()); return extent.read().get_end_p_laddr(); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -853,7 +853,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { assert(p_value->value == src); extent.update_child_addr_replayable(dst, const_cast(p_value)); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -874,7 +874,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { } return {insert_stage, insert_size}; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -895,7 +895,7 @@ class NodeLayoutT final : public InternalNodeImpl, public LeafNodeImpl { key, value, history, mstat, cast_down(insert_pos)); } } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout_replayable.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout_replayable.h index d8a18231e6a67..822f35194fcfb 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout_replayable.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_layout_replayable.h @@ -130,7 +130,7 @@ struct NodeLayoutReplayableT { // return erase_stage, last_pos return {erase_stage, last_pos}; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } }; diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.cc index 4bf717dc224ea..71bbbed435406 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.cc @@ -27,7 +27,7 @@ void string_key_view_t::append_dedup( } else if (dedup_type == Type::MAX) { mut.copy_in_absolute(p_append, MARKER_MAX); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h index b58a895ff2334..8faa32c86b3dc 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h @@ -178,7 +178,7 @@ struct string_key_view_t { } else if (dedup_type == Type::MAX) { len = MARKER_MAX; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } std::memcpy(p_append, &len, sizeof(string_size_t)); } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc index 3ed401c375185..aab30ad3c772e 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc @@ -41,7 +41,7 @@ node_offset_t NODE_T::size_to_nxt_at(index_t index) const p_fields->get_item_end_offset(index, node_size); return FieldType::estimate_insert_one() + ns_oid_view_t(p_end).size(); } else { - ceph_abort("N3 node is not nested"); + ceph_abort_msg("N3 node is not nested"); } } @@ -49,7 +49,7 @@ template container_range_t NODE_T::get_nxt_container(index_t index) const { if constexpr (std::is_same_v) { - ceph_abort("N3 internal node doesn't have the right part"); + ceph_abort_msg("N3 internal node doesn't have the right part"); } else { auto item_start_offset = p_fields->get_item_start_offset( index, node_size); @@ -113,9 +113,9 @@ memory_range_t NODE_T::insert_prefix_at( -(int)size_right); return {p_insert_front, p_insert}; } else if constexpr (FIELD_TYPE == field_type_t::N2) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } #define IPA_TEMPLATE(FT, NT, Key) \ @@ -158,7 +158,7 @@ node_offset_t NODE_T::trim_until( return 0; } if constexpr (std::is_same_v) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { mut.copy_in_absolute( (void*)&node.p_fields->num_keys, num_keys_t(index)); @@ -177,7 +177,7 @@ node_offset_t NODE_T::trim_at( assert(!node.is_level_tail()); assert(index < node.keys()); if constexpr (std::is_same_v) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { extent_len_t node_size = mut.get_length(); node_offset_t offset = node.p_fields->get_item_start_offset( @@ -207,7 +207,7 @@ node_offset_t NODE_T::erase_at( assert(p_left_bound == node.p_left_bound()); return FieldType::erase_at(mut, node.fields(), index, p_left_bound); } else { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } } @@ -243,15 +243,15 @@ APPEND_T::Appender(NodeExtentMutable* p_mut, const node_extent_t& node, bool ope node.fields().get_item_end_offset(node.keys() - 1, node_size); } else if constexpr (FIELD_TYPE == field_type_t::N2) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } num_keys = node.keys() - 1; } else { if constexpr (std::is_same_v) { std::ignore = node_size; - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { p_append_left = p_start + node.fields().get_key_start_offset( node.keys(), node_size); @@ -283,7 +283,7 @@ void APPEND_T::append(const node_extent_t& src, index_t from, index_t items) num_keys += items; if constexpr (std::is_same_v) { std::ignore = node_size; - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { // append left part forwards node_offset_t offset_left_start = src.fields().get_key_start_offset( @@ -343,9 +343,9 @@ void APPEND_T::append( const full_key_t& key, const value_input_t& value, const value_t*& p_value) { if constexpr (FIELD_TYPE == field_type_t::N3) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { - ceph_abort("should not happen"); + ceph_abort_msg("should not happen"); } } @@ -360,7 +360,7 @@ APPEND_T::open_nxt(const key_get_type& partial_key) } else if constexpr (FIELD_TYPE == field_type_t::N2) { FieldType::append_key(*p_mut, partial_key, p_append_right); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } return {p_mut, p_append_right}; } @@ -376,7 +376,7 @@ APPEND_T::open_nxt(const full_key_t& key) } else if constexpr (FIELD_TYPE == field_type_t::N2) { FieldType::append_key(*p_mut, key, p_append_right); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } return {p_mut, p_append_right}; } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.h index 5615998f8f8ef..706b259e41ea7 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.h @@ -152,9 +152,9 @@ class node_extent_t { const Key& key, const value_input_t& value, index_t index, node_offset_t size, const char* p_left_bound) { if constexpr (FIELD_TYPE == field_type_t::N3) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } else { - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } @@ -216,7 +216,7 @@ class node_extent_t::Appender { FieldType::append_offset(*p_mut, new_offset, p_append_left); ++num_keys; } else { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h index 1ed4865a629df..851a4f0ea34e5 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h @@ -282,11 +282,11 @@ struct node_fields_2_t { static void insert_at( NodeExtentMutable& mut, const Key& key, const node_fields_2_t& node, index_t index, node_offset_t size_right) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } static void update_size_at( NodeExtentMutable& mut, const node_fields_2_t& node, index_t index, int change) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } static void append_key( NodeExtentMutable& mut, const key_t& key, char*& p_append) { @@ -379,12 +379,12 @@ struct internal_fields_3_t { NodeExtentMutable& mut, const Key& key, const internal_fields_3_t& node, index_t index, node_offset_t size_right) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } static void update_size_at( NodeExtentMutable& mut, const internal_fields_3_t& node, index_t index, int change) { - ceph_abort("not implemented"); + ceph_abort_msg("not implemented"); } node_header_t header; diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h index 6b5ab13645ed7..5fd877b3015c4 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage.h @@ -108,7 +108,7 @@ inline void assert_mstat( } break; default: - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } // key == index ... switch (mstat) { @@ -471,7 +471,7 @@ struct staged { assert(_index + 1 == container.keys()); return typename container_t::template Appender(p_mut, container, true); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -809,7 +809,7 @@ struct staged { if constexpr (!IS_BOTTOM) { return typename container_t::template Appender(p_mut, container, true); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -1174,7 +1174,7 @@ struct staged { auto match = key <=> iter.get_key(); if (match == 0) { if constexpr (IS_BOTTOM) { - ceph_abort("insert conflict at current index!"); + ceph_abort_msg("insert conflict at current index!"); } else { // insert into the current index auto nxt_container = iter.get_nxt_container(); @@ -1204,7 +1204,7 @@ struct staged { assert(match == std::strong_ordering::equal); if constexpr (IS_BOTTOM) { // ceph_abort? - ceph_abort("insert conflict at the previous index!"); + ceph_abort_msg("insert conflict at the previous index!"); } else { // insert into the previous index auto nxt_container = iter.get_nxt_container(); @@ -1225,7 +1225,7 @@ struct staged { return true; } else { if constexpr (IS_BOTTOM) { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } else { assert(stage < STAGE); bool compensate = NXT_STAGE_T:: @@ -1379,7 +1379,7 @@ struct staged { iter.update_size(mut, _insert_size); return p_value; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } } @@ -1400,7 +1400,7 @@ struct staged { stage = STAGE; _insert_size = insert_size(key, value); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } if constexpr (IS_BOTTOM) { return container_t::insert_at( @@ -1640,14 +1640,14 @@ struct staged { } return this->_nxt; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } typename NXT_STAGE_T::StagedIterator& get_nxt() { if constexpr (!IS_BOTTOM) { return this->_nxt; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } StagedIterator& operator++() { @@ -1933,7 +1933,7 @@ struct staged { return false; } } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); return false;; } } @@ -1998,7 +1998,7 @@ struct staged { auto nxt_container = iter.get_nxt_container(); this->_nxt.init_tail(p_mut, nxt_container, stage); } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } } @@ -2050,7 +2050,7 @@ struct staged { this->_nxt.init_empty(p_mut, p_append); return this->_nxt; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } typename NXT_STAGE_T::template StagedAppender& @@ -2062,7 +2062,7 @@ struct staged { this->_nxt.init_empty(p_mut, p_append); return this->_nxt; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } typename NXT_STAGE_T::template StagedAppender& get_nxt() { @@ -2070,7 +2070,7 @@ struct staged { assert(require_wrap_nxt); return this->_nxt; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } void wrap_nxt() { @@ -2081,7 +2081,7 @@ struct staged { appender->wrap_nxt(p_append); ++_index; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } private: @@ -2197,7 +2197,7 @@ struct staged { } return false; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } } @@ -2360,13 +2360,13 @@ struct staged { compensate += ret_compensate; return {ret_stage, compensate}; } else { - ceph_abort("impossible path: left_pivot_key == right_first_key"); + ceph_abort_msg("impossible path: left_pivot_key == right_first_key"); } } else if (cmp == std::strong_ordering::less) { // ok, do merge here return {STAGE, compensate}; } else { - ceph_abort("impossible path: left_pivot_key < right_first_key"); + ceph_abort_msg("impossible path: left_pivot_key < right_first_key"); } } }; diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage_types.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage_types.h index 9bbfd5d6063b8..7092bdf397f1c 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage_types.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/stage_types.h @@ -91,7 +91,7 @@ struct MatchHistory { } else if (*match == MatchKindCMP::GT) { return os << "GT"; } else { - ceph_abort("impossble path"); + ceph_abort_msg("impossble path"); } } @@ -318,7 +318,7 @@ const staged_position_t& cast_down(const search_position_t& pos) { #endif return pos.nxt.nxt; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -340,7 +340,7 @@ staged_position_t& cast_down_fill_0(search_position_t& pos) { pos.nxt.index = 0; return pos.nxt.nxt; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } @@ -356,7 +356,7 @@ search_position_t normalize(staged_position_t&& pos) { } else if (STAGE == STAGE_RIGHT) { return {0u, {0u, std::move(pos)}}; } else { - ceph_abort("impossible path"); + ceph_abort_msg("impossible path"); } } diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h b/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h index 68f8a55e6c76d..7121bc8e0f9bc 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/tree.h @@ -68,7 +68,7 @@ class Btree { // we don't actually store end cursor because it will hold a reference // to an end leaf node and is not kept updated. assert(p_cursor->is_end()); - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } } @@ -130,7 +130,7 @@ class Btree { Cursor(Btree* p_tree, Ref _p_cursor) : p_tree(p_tree) { if (_p_cursor->is_invalid()) { // we don't create Cursor from an invalid tree_cursor_t. - ceph_abort("impossible"); + ceph_abort_msg("impossible"); } else if (_p_cursor->is_end()) { // we don't actually store end cursor because it will hold a reference // to an end leaf node and is not kept updated. diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h index 0238307a9745d..a5788367515f0 100644 --- a/src/crimson/os/seastore/transaction_manager.h +++ b/src/crimson/os/seastore/transaction_manager.h @@ -216,7 +216,7 @@ public: if (length != pin.get_length() || !pin.get_val().is_real_location()) { SUBERRORT(seastore_tm, "{}~0x{:x} {} got wrong pin {}", t, offset, length, T::TYPE, pin); - ceph_abort("Impossible"); + ceph_abort_msg("Impossible"); } return this->read_pin(t, std::move(pin), std::move(maybe_init)); }); @@ -243,7 +243,7 @@ public: if (!pin.get_val().is_real_location()) { SUBERRORT(seastore_tm, "{} {} got wrong pin {}", t, offset, T::TYPE, pin); - ceph_abort("Impossible"); + ceph_abort_msg("Impossible"); } return this->read_pin(t, std::move(pin), std::move(maybe_init)); }); diff --git a/src/crimson/osd/pg_map.cc b/src/crimson/osd/pg_map.cc index ee65646205ece..79a00af73b6a3 100644 --- a/src/crimson/osd/pg_map.cc +++ b/src/crimson/osd/pg_map.cc @@ -24,7 +24,7 @@ seastar::future PGShardMapping::get_or_create_pg_mapping( if (core_expected != NULL_CORE && core_expected != core_found) { ERROR("the mapping is inconsistent for pg {}: core {}, expected {}", pgid, core_found, core_expected); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } return seastar::make_ready_future(core_found); } else { @@ -43,7 +43,7 @@ seastar::future PGShardMapping::get_or_create_pg_mapping( if (core_expected != core_found) { ERROR("the mapping is inconsistent for pg {} (primary): core {}, expected {}", pgid, core_found, core_expected); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } // core_expected == core_found DEBUG("mapping pg {} to core {} (primary): already mapped and expected", @@ -94,7 +94,7 @@ seastar::future PGShardMapping::get_or_create_pg_mapping( if (core_found != core_to_update) { ERROR("the mapping is inconsistent for pg {} (others): core {}, expected {}", pgid, core_found, core_to_update); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } DEBUG("mapping pg {} to core {} (others): already mapped", pgid, core_to_update); @@ -105,13 +105,13 @@ seastar::future PGShardMapping::get_or_create_pg_mapping( if (find_iter == pg_to_core.end()) { ERROR("the mapping is inconsistent for pg {}: core not found, expected {}", pgid, core_expected); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } auto core_found = find_iter->second; if (core_expected != NULL_CORE && core_found != core_expected) { ERROR("the mapping is inconsistent for pg {}: core {}, expected {}", pgid, core_found, core_expected); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } DEBUG("returning pg {} mapping to core {} after broadcasted", pgid, core_found); @@ -125,7 +125,7 @@ seastar::future<> PGShardMapping::remove_pg_mapping(spg_t pgid) { auto find_iter = pg_to_core.find(pgid); if (find_iter == pg_to_core.end()) { ERROR("trying to remove non-exist mapping for pg {}", pgid); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } DEBUG("calling primary to remove mapping for pg {}", pgid); return container().invoke_on( @@ -133,7 +133,7 @@ seastar::future<> PGShardMapping::remove_pg_mapping(spg_t pgid) { auto find_iter = primary_mapping.pg_to_core.find(pgid); if (find_iter == primary_mapping.pg_to_core.end()) { ERROR("trying to remove non-exist mapping for pg {} (primary)", pgid); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } assert(find_iter->second != NULL_CORE); auto count_iter = primary_mapping.core_to_num_pgs.find(find_iter->second); @@ -147,7 +147,7 @@ seastar::future<> PGShardMapping::remove_pg_mapping(spg_t pgid) { auto find_iter = other_mapping.pg_to_core.find(pgid); if (find_iter == other_mapping.pg_to_core.end()) { ERROR("trying to remove non-exist mapping for pg {} (others)", pgid); - ceph_abort("The pg mapping is inconsistent!"); + ceph_abort_msg("The pg mapping is inconsistent!"); } assert(find_iter->second != NULL_CORE); other_mapping.pg_to_core.erase(find_iter); diff --git a/src/crimson/osd/recovery_backend.cc b/src/crimson/osd/recovery_backend.cc index 5c25409a80a4c..c4c1382f2c25e 100644 --- a/src/crimson/osd/recovery_backend.cc +++ b/src/crimson/osd/recovery_backend.cc @@ -91,7 +91,7 @@ void RecoveryBackend::WaitForObjectRecovery::interrupt(interrupt_cause_t why) { pushes.clear(); break; default: - ceph_abort("impossible"); + ceph_abort_msg("impossible"); break; } } diff --git a/src/crimson/osd/scrub/scrub_machine.h b/src/crimson/osd/scrub/scrub_machine.h index 511e8aa865f3a..7472dd62dddb3 100644 --- a/src/crimson/osd/scrub/scrub_machine.h +++ b/src/crimson/osd/scrub/scrub_machine.h @@ -339,7 +339,7 @@ struct ScrubState : sc::state { struct Crash : ScrubState { static constexpr std::string_view state_name = "Crash"; explicit Crash(my_context ctx) : ScrubState(ctx) { - ceph_abort("Crash state impossible"); + ceph_abort_msg("Crash state impossible"); } }; diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc index c9168aaf36fd7..6a983648d04bc 100644 --- a/src/crimson/osd/shard_services.cc +++ b/src/crimson/osd/shard_services.cc @@ -772,7 +772,7 @@ seastar::future> ShardServices::load_pg(spg_t pgid) }); }).handle_exception([FNAME, pgid](auto ep) { INFO("pg {} saw exception on load {}", pgid, ep); - ceph_abort("Could not load pg" == 0); + ceph_abort_msg("Could not load pg"); return seastar::make_exception_future>(ep); }); } diff --git a/src/crimson/tools/perf_crimson_msgr.cc b/src/crimson/tools/perf_crimson_msgr.cc index 66c2dc447332d..d2682a3440c3b 100644 --- a/src/crimson/tools/perf_crimson_msgr.cc +++ b/src/crimson/tools/perf_crimson_msgr.cc @@ -199,7 +199,7 @@ static seastar::future<> run( void ms_handle_connect( crimson::net::ConnectionRef, seastar::shard_id) override { - ceph_abort("impossible, server won't connect"); + ceph_abort_msg("impossible, server won't connect"); } void ms_handle_accept( -- 2.39.5