From 12f98a23598b260f4d807db1a0d760b979c68c9d Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Tue, 16 Jul 2024 10:35:33 +0800 Subject: [PATCH] crimson/os/seastore/circular_journal_space: cleanup, write_ertr vs submit_ertr Signed-off-by: Yingxin Cheng --- .../os/seastore/journal/circular_journal_space.cc | 11 ++++++----- .../os/seastore/journal/circular_journal_space.h | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/crimson/os/seastore/journal/circular_journal_space.cc b/src/crimson/os/seastore/journal/circular_journal_space.cc index cf6bbd8a49904..a26b5a652d5e6 100644 --- a/src/crimson/os/seastore/journal/circular_journal_space.cc +++ b/src/crimson/os/seastore/journal/circular_journal_space.cc @@ -84,7 +84,7 @@ CircularJournalSpace::write(ceph::bufferlist&& to_write) { target, get_records_used_size(), length); return write_result; }).handle_error( - base_ertr::pass_further{}, + write_ertr::pass_further{}, crimson::ct_error::assert_all{ "Invalid error" } ); } @@ -167,7 +167,8 @@ ceph::bufferlist CircularJournalSpace::encode_header() return bl; } -CircularJournalSpace::write_ertr::future<> CircularJournalSpace::device_write_bl( +CircularJournalSpace::submit_ertr::future<> +CircularJournalSpace::device_write_bl( rbm_abs_addr offset, bufferlist &bl) { LOG_PREFIX(CircularJournalSpace::device_write_bl); @@ -181,7 +182,7 @@ CircularJournalSpace::write_ertr::future<> CircularJournalSpace::device_write_bl length); return device->writev(offset, bl ).handle_error( - write_ertr::pass_further{}, + submit_ertr::pass_further{}, crimson::ct_error::assert_all{ "Invalid error device->write" } ); } @@ -229,7 +230,7 @@ CircularJournalSpace::read_header() }); } -CircularJournalSpace::write_ertr::future<> +CircularJournalSpace::submit_ertr::future<> CircularJournalSpace::write_header() { LOG_PREFIX(CircularJournalSpace::write_header); @@ -245,7 +246,7 @@ CircularJournalSpace::write_header() iter.copy(bl.length(), bp.c_str()); return device->write(device->get_shard_journal_start(), std::move(bp) ).handle_error( - write_ertr::pass_further{}, + submit_ertr::pass_further{}, crimson::ct_error::assert_all{ "Invalid error device->write" } ); } diff --git a/src/crimson/os/seastore/journal/circular_journal_space.h b/src/crimson/os/seastore/journal/circular_journal_space.h index ae18656b06162..2e1cb7ae8df63 100644 --- a/src/crimson/os/seastore/journal/circular_journal_space.h +++ b/src/crimson/os/seastore/journal/circular_journal_space.h @@ -69,7 +69,7 @@ class CircularJournalSpace : public JournalAllocator { CircularJournalSpace(RBMDevice * device); struct cbj_header_t; - using write_ertr = Journal::submit_record_ertr; + using submit_ertr = Journal::submit_record_ertr; /* * device_write_bl * @@ -77,7 +77,8 @@ class CircularJournalSpace : public JournalAllocator { * @param bufferlist to write * */ - write_ertr::future<> device_write_bl(rbm_abs_addr offset, ceph::bufferlist &bl); + submit_ertr::future<> + device_write_bl(rbm_abs_addr offset, ceph::bufferlist &bl); using read_ertr = crimson::errorator< crimson::ct_error::input_output_error, @@ -100,7 +101,7 @@ class CircularJournalSpace : public JournalAllocator { ceph::bufferlist encode_header(); - write_ertr::future<> write_header(); + submit_ertr::future<> write_header(); /** -- 2.39.5