From 4a76d8f79d15334bc2263c7846c558c421b4dae1 Mon Sep 17 00:00:00 2001 From: chunmei-liu Date: Wed, 2 Jun 2021 23:41:42 -0700 Subject: [PATCH] crimson/seastore: cleanup ceph_subsystem_filestore to seastore Signed-off-by: chunmei-liu --- src/crimson/os/seastore/cached_extent.cc | 2 +- .../seastore/collection_manager/collection_flat_node.cc | 2 +- .../collection_manager/flat_collection_manager.cc | 2 +- src/crimson/os/seastore/journal.cc | 2 +- src/crimson/os/seastore/journal.h | 2 +- .../os/seastore/lba_manager/btree/btree_lba_manager.cc | 2 +- .../os/seastore/lba_manager/btree/btree_range_pin.cc | 2 +- .../os/seastore/lba_manager/btree/lba_btree_node_impl.cc | 2 +- src/crimson/os/seastore/object_data_handler.cc | 2 +- .../os/seastore/omap_manager/btree/btree_omap_manager.cc | 2 +- .../seastore/omap_manager/btree/omap_btree_node_impl.cc | 2 +- src/crimson/os/seastore/segment_cleaner.cc | 2 +- src/crimson/os/seastore/segment_cleaner.h | 8 ++++---- src/crimson/os/seastore/segment_manager/block.cc | 2 +- src/crimson/os/seastore/segment_manager/ephemeral.cc | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/crimson/os/seastore/cached_extent.cc b/src/crimson/os/seastore/cached_extent.cc index 9612a739608..ee0a52ceb69 100644 --- a/src/crimson/os/seastore/cached_extent.cc +++ b/src/crimson/os/seastore/cached_extent.cc @@ -7,7 +7,7 @@ namespace { [[maybe_unused]] seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/collection_manager/collection_flat_node.cc b/src/crimson/os/seastore/collection_manager/collection_flat_node.cc index 52a0e081ca4..1cd440d2b6b 100644 --- a/src/crimson/os/seastore/collection_manager/collection_flat_node.cc +++ b/src/crimson/os/seastore/collection_manager/collection_flat_node.cc @@ -8,7 +8,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc b/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc index 40c66487788..147f304e183 100644 --- a/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc +++ b/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc @@ -12,7 +12,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc index 0c852cab64b..5a317c2cc50 100644 --- a/src/crimson/os/seastore/journal.cc +++ b/src/crimson/os/seastore/journal.cc @@ -12,7 +12,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/journal.h b/src/crimson/os/seastore/journal.h index e244fc71536..7b0bae2490c 100644 --- a/src/crimson/os/seastore/journal.h +++ b/src/crimson/os/seastore/journal.h @@ -195,7 +195,7 @@ public: auto rsize = get_encoded_record_length(record); auto total = rsize.mdlength + rsize.dlength; if (total > max_record_length()) { - auto &logger = crimson::get_logger(ceph_subsys_filestore); + auto &logger = crimson::get_logger(ceph_subsys_seastore); logger.error( "Journal::submit_record: record size {} exceeds max {}", total, diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc index 94d11e31e93..c328f1ab360 100644 --- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc +++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc @@ -13,7 +13,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_range_pin.cc b/src/crimson/os/seastore/lba_manager/btree/btree_range_pin.cc index aab9d97c9a6..0168be0236a 100644 --- a/src/crimson/os/seastore/lba_manager/btree/btree_range_pin.cc +++ b/src/crimson/os/seastore/lba_manager/btree/btree_range_pin.cc @@ -7,7 +7,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc index 5139dae4ef4..2adb8eff281 100644 --- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc +++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc @@ -14,7 +14,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/object_data_handler.cc b/src/crimson/os/seastore/object_data_handler.cc index 642744354ed..25bf78661db 100644 --- a/src/crimson/os/seastore/object_data_handler.cc +++ b/src/crimson/os/seastore/object_data_handler.cc @@ -10,7 +10,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/omap_manager/btree/btree_omap_manager.cc b/src/crimson/os/seastore/omap_manager/btree/btree_omap_manager.cc index e4fa724fff7..3e9ed12f9b3 100644 --- a/src/crimson/os/seastore/omap_manager/btree/btree_omap_manager.cc +++ b/src/crimson/os/seastore/omap_manager/btree/btree_omap_manager.cc @@ -11,7 +11,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc index ca5479b49f6..be496dd1e7b 100644 --- a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc +++ b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc @@ -12,7 +12,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/segment_cleaner.cc b/src/crimson/os/seastore/segment_cleaner.cc index e69257af53f..775488abd03 100644 --- a/src/crimson/os/seastore/segment_cleaner.cc +++ b/src/crimson/os/seastore/segment_cleaner.cc @@ -8,7 +8,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/segment_cleaner.h b/src/crimson/os/seastore/segment_cleaner.h index 8ebf86d9ca1..05ac94ccb63 100644 --- a/src/crimson/os/seastore/segment_cleaner.h +++ b/src/crimson/os/seastore/segment_cleaner.h @@ -437,7 +437,7 @@ public: } void init_mark_segment_closed(segment_id_t segment, segment_seq_t seq) final { - crimson::get_logger(ceph_subsys_filestore).debug( + crimson::get_logger(ceph_subsys_seastore).debug( "SegmentCleaner::init_mark_segment_closed: segment {}, seq {}", segment, seq); @@ -501,7 +501,7 @@ public: } } if (ret != NULL_SEG_ID) { - crimson::get_logger(ceph_subsys_filestore).debug( + crimson::get_logger(ceph_subsys_seastore).debug( "SegmentCleaner::get_next_gc_target: segment {} seq {}", ret, segments[ret].journal_segment_seq); @@ -776,7 +776,7 @@ private: } void log_gc_state(const char *caller) const { - auto &logger = crimson::get_logger(ceph_subsys_filestore); + auto &logger = crimson::get_logger(ceph_subsys_seastore); if (logger.is_enabled(seastar::log_level::debug)) { logger.debug( "SegmentCleaner::log_gc_state({}): " @@ -877,7 +877,7 @@ private: assert(empty_segments > 0); --empty_segments; } - crimson::get_logger(ceph_subsys_filestore).debug( + crimson::get_logger(ceph_subsys_seastore).debug( "mark_closed: empty_segments: {}", empty_segments); segments[segment].state = Segment::segment_state_t::CLOSED; diff --git a/src/crimson/os/seastore/segment_manager/block.cc b/src/crimson/os/seastore/segment_manager/block.cc index 7cf71a4e4c9..ecaf5e9c908 100644 --- a/src/crimson/os/seastore/segment_manager/block.cc +++ b/src/crimson/os/seastore/segment_manager/block.cc @@ -12,7 +12,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } diff --git a/src/crimson/os/seastore/segment_manager/ephemeral.cc b/src/crimson/os/seastore/segment_manager/ephemeral.cc index 7e3a5a06029..77013ec838d 100644 --- a/src/crimson/os/seastore/segment_manager/ephemeral.cc +++ b/src/crimson/os/seastore/segment_manager/ephemeral.cc @@ -13,7 +13,7 @@ namespace { seastar::logger& logger() { - return crimson::get_logger(ceph_subsys_filestore); + return crimson::get_logger(ceph_subsys_seastore); } } -- 2.39.5