From: myoungwon oh <ohmyoungwon@gmail.com>
Date: Fri, 13 May 2022 08:28:09 +0000 (+0900)
Subject: seastore/cbjournal: add assert(initialized), revmoving open_device_read_header()
X-Git-Tag: v18.0.0~857^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8ee3353bd7a5cbfafc57b00c0c642a7b70d7341;p=ceph.git

seastore/cbjournal: add assert(initialized), revmoving open_device_read_header()

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>
---

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
index 19bf019a3d5b..cc44df9d46b8 100644
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
@@ -102,18 +102,16 @@ ceph::bufferlist CircularBoundedJournal::encode_header()
 
 CircularBoundedJournal::open_for_write_ret CircularBoundedJournal::open_for_write()
 {
-  if (initialized) {
-    paddr_t paddr = convert_abs_addr_to_paddr(
-      get_written_to(),
-      header.device_id);
-    return open_for_write_ret(
-      open_for_write_ertr::ready_future_marker{},
-      journal_seq_t{
-	cur_segment_seq,
-	paddr
-      });
-  }
-  return open_device_read_header(CBJOURNAL_START_ADDRESS);
+  ceph_assert(initialized);
+  paddr_t paddr = convert_abs_addr_to_paddr(
+    get_written_to(),
+    header.device_id);
+  return open_for_write_ret(
+    open_for_write_ertr::ready_future_marker{},
+    journal_seq_t{
+      cur_segment_seq,
+      paddr
+  });
 }
 
 CircularBoundedJournal::close_ertr::future<> CircularBoundedJournal::close()
diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h
index 823d7b8305e8..f30fe92cd0a5 100644
--- a/src/test/crimson/seastore/transaction_manager_test_state.h
+++ b/src/test/crimson/seastore/transaction_manager_test_state.h
@@ -208,10 +208,14 @@ protected:
       return static_cast<journal::CircularBoundedJournal*>(tm->get_journal())->mkfs(
 	config
       ).safe_then([this]() {
-	return tm->mkfs(
-	).handle_error(
-	  crimson::ct_error::assert_all{"Error in mkfs"}
-	);
+	return static_cast<journal::CircularBoundedJournal*>(tm->get_journal())->
+	  open_device_read_header(journal::CBJOURNAL_START_ADDRESS
+	).safe_then([this](auto addr) {
+	  return tm->mkfs(
+	  ).handle_error(
+	    crimson::ct_error::assert_all{"Error in mkfs"}
+	  );
+	});
       }).handle_error(
 	crimson::ct_error::assert_all{"Error in mkfs"}
       );