crimson/os/seastore/segment_cleaner: introduce ExtentCallbackInterface::submit_transa...

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/os/seastore/segment_cleaner.cc b/src/crimson/os/seastore/segment_cleaner.cc
index f1b17018d3a4dbe383ca437a69a89b5732c1c54f..3d43203a1adbdf426c98e17972511b41b8b8baab 100644 (file)
--- a/src/crimson/os/seastore/segment_cleaner.cc
+++ b/src/crimson/os/seastore/segment_cleaner.cc
@@ -3,7 +3,6 @@
 
 #include "crimson/common/log.h"
 
-#include "crimson/os/seastore/transaction.h"
 #include "crimson/os/seastore/segment_cleaner.h"
 
 namespace {

diff --git a/src/crimson/os/seastore/segment_cleaner.h b/src/crimson/os/seastore/segment_cleaner.h
index e6297e57e2c03524baee72b555fc1b865ec8c297..2f8ae318ccf38184d06e6b54b6c1566e5018154e 100644 (file)
--- a/src/crimson/os/seastore/segment_cleaner.h
+++ b/src/crimson/os/seastore/segment_cleaner.h
@@ -11,9 +11,9 @@
 #include "crimson/os/seastore/journal.h"
 #include "crimson/os/seastore/seastore_types.h"
 #include "crimson/os/seastore/segment_manager.h"
+#include "crimson/os/seastore/transaction.h"
 
 namespace crimson::os::seastore {
-class Transaction;
 
 struct segment_info_t {
   Segment::segment_state_t state = Segment::segment_state_t::EMPTY;
@@ -310,6 +310,20 @@ public:
     using release_segment_ret = release_segment_ertr::future<>;
     virtual release_segment_ret release_segment(
       segment_id_t id) = 0;
+
+    /**
+     * submit_transaction_direct
+     *
+     * Submits transaction without any space throttling.
+     */
+    using submit_transaction_direct_ertr = crimson::errorator<
+      crimson::ct_error::eagain,
+      crimson::ct_error::input_output_error
+      >;
+    using submit_transaction_direct_ret =
+      submit_transaction_direct_ertr::future<>;
+    virtual submit_transaction_direct_ret submit_transaction_direct(
+      TransactionRef t) = 0;
   };
 
 private:

diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index 9592ba854acfb30fe0916550dcc71267aef30dfc..d7be39d33f407db0df964021de15f2ea96475209 100644 (file)
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -49,7 +49,7 @@ TransactionManager::mkfs_ertr::future<> TransactionManager::mkfs()
          return lba_manager->mkfs(*transaction);
        }).safe_then([this, &transaction] {
          logger().debug("TransactionManager::mkfs: about to submit_transaction");
-         return submit_transaction(std::move(transaction)).handle_error(
+         return submit_transaction_direct(std::move(transaction)).handle_error(
            crimson::ct_error::eagain::handle([] {
              ceph_assert(0 == "eagain impossible");
              return mkfs_ertr::now();
@@ -231,6 +231,47 @@ TransactionManager::submit_transaction(
     });
 }
 
+TransactionManager::submit_transaction_direct_ret
+TransactionManager::submit_transaction_direct(
+  TransactionRef t)
+{
+  logger().debug("TransactionManager::submit_transaction_direct");
+  auto &tref = *t;
+  return tref.handle.enter(write_pipeline.prepare
+  ).then([this, &tref]() mutable
+        -> submit_transaction_ertr::future<> {
+    auto record = cache->try_construct_record(tref);
+    if (!record) {
+      return crimson::ct_error::eagain::make();
+    }
+
+    return journal->submit_record(std::move(*record), tref.handle
+    ).safe_then([this, &tref](auto p) mutable {
+      auto [addr, journal_seq] = p;
+      segment_cleaner->set_journal_head(journal_seq);
+      cache->complete_commit(tref, addr, journal_seq, segment_cleaner.get());
+      lba_manager->complete_transaction(tref);
+      auto to_release = tref.get_segment_to_release();
+      if (to_release != NULL_SEG_ID) {
+       return segment_manager.release(to_release
+       ).safe_then([this, to_release] {
+         segment_cleaner->mark_segment_released(to_release);
+       });
+      } else {
+       return SegmentManager::release_ertr::now();
+      }
+    }).safe_then([&tref] {
+      return tref.handle.complete();
+    }).handle_error(
+      submit_transaction_ertr::pass_further{},
+      crimson::ct_error::all_same_way([](auto e) {
+       ceph_assert(0 == "Hit error submitting to journal");
+      }));
+    }).finally([t=std::move(t)]() mutable {
+      t->handle.exit();
+    });
+}
+
 TransactionManager::get_next_dirty_extents_ret
 TransactionManager::get_next_dirty_extents(journal_seq_t seq)
 {

diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h
index 897475982361fd0f45b1171e4ef510d0493573f8..9b38a185353eb470118fa132cb970f39fba263e6 100644 (file)
--- a/src/crimson/os/seastore/transaction_manager.h
+++ b/src/crimson/os/seastore/transaction_manager.h
@@ -281,6 +281,9 @@ public:
   submit_transaction_ertr::future<> submit_transaction(TransactionRef);
 
   /// SegmentCleaner::ExtentCallbackInterface
+  using SegmentCleaner::ExtentCallbackInterface::submit_transaction_direct_ret;
+  submit_transaction_direct_ret submit_transaction_direct(
+    TransactionRef t) final;
 
   using SegmentCleaner::ExtentCallbackInterface::get_next_dirty_extents_ret;
   get_next_dirty_extents_ret get_next_dirty_extents(