crimson/os: add OnodeBlock

used for representing the an node of onode tree

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/crimson/os/seastore/CMakeLists.txt b/src/crimson/os/seastore/CMakeLists.txt
index 74a7729bee0fd581441b99ec9e6eb709958361b8..1d4998bbb36d98baec72e360ecc5100c1185b3d8 100644 (file)
--- a/src/crimson/os/seastore/CMakeLists.txt
+++ b/src/crimson/os/seastore/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(crimson-seastore
   lba_manager/btree/btree_lba_manager.cc
   lba_manager/btree/lba_btree_node_impl.cc
   onode.cc
+  onode_manager/simple-fltree/onode_block.cc
   onode_manager/simple-fltree/onode_delta.cc
   onode_manager/simple-fltree/onode_node.cc
   seastore.cc

diff --git a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc
new file mode 100644 (file)
index 0000000..9966263
--- /dev/null
+++ b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.cc
@@ -0,0 +1,74 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include "onode_block.h"
+
+namespace crimson::os::seastore {
+
+ceph::bufferlist OnodeBlock::get_delta()
+{
+  bufferlist bl;
+  assert(deltas.size() <= std::numeric_limits<uint8_t>::max());
+  uint8_t n_deltas = deltas.size();
+  ceph::encode(n_deltas, bl);
+  for (auto& delta : deltas) {
+    delta->encode(bl);
+  }
+  return bl;
+}
+
+void OnodeBlock::on_initial_write()
+{}
+
+void OnodeBlock::on_delta_write(paddr_t)
+{
+  // journal submitted to disk, now update the memory
+  apply_pending_changes(true);
+}
+
+void OnodeBlock::apply_delta(paddr_t, ceph::bufferlist &bl)
+{
+  assert(deltas.empty());
+
+  auto p = bl.cbegin();
+  uint8_t n_deltas = 0;
+  ceph::decode(n_deltas, p);
+  for (uint8_t i = 0; i < n_deltas; i++) {
+    delta_t delta;
+    delta.decode(p);
+    mutate(std::move(delta));
+  }
+  apply_pending_changes(true);
+}
+
+void OnodeBlock::mutate(delta_t&& d)
+{
+  if (is_initial_pending()) {
+    char* const p = get_bptr().c_str();
+    mutate_func(p, d);
+  }
+  deltas.push_back(std::make_unique<delta_t>(std::move(d)));
+}
+
+void OnodeBlock::apply_pending_changes(bool do_cleanup)
+{
+  if (!is_mutation_pending()) {
+    return;
+  }
+  if (share_buffer) {
+    // do a deep copy so i can change my own copy
+    get_bptr() = ceph::bufferptr{get_bptr().c_str(),
+                                get_bptr().length()};
+    share_buffer = false;
+  }
+  assert(mutate_func);
+  char* const p = get_bptr().c_str();
+  for (auto& delta : deltas) {
+    mutate_func(p, *delta);
+    if (do_cleanup) {
+      delta.reset();
+    }
+  }
+}
+
+}

diff --git a/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h
new file mode 100644 (file)
index 0000000..1c15064
--- /dev/null
+++ b/src/crimson/os/seastore/onode_manager/simple-fltree/onode_block.h
@@ -0,0 +1,69 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include <cstdint>
+#include <boost/container/small_vector.hpp>
+
+#include "crimson/os/seastore/transaction_manager.h"
+#include "onode_delta.h"
+
+namespace crimson::os::seastore {
+
+// TODO s/CachedExtent/LogicalCachedExtent/
+struct OnodeBlock final : LogicalCachedExtent {
+  using Ref = TCachedExtentRef<OnodeBlock>;
+
+  template <typename... T>
+  OnodeBlock(T&&... t) : LogicalCachedExtent(std::forward<T>(t)...) {}
+  OnodeBlock(OnodeBlock&& block) noexcept
+    : LogicalCachedExtent{std::move(block)},
+      deltas{std::move(block.deltas)}
+  {}
+  OnodeBlock(const OnodeBlock& block, CachedExtent::share_buffer_t tag) noexcept
+    : LogicalCachedExtent{block, tag},
+      share_buffer{true}
+  {}
+
+  CachedExtentRef duplicate_for_write() final {
+    return new OnodeBlock{*this, CachedExtent::share_buffer_t{}};
+  }
+
+  // could materialize the pending changes to the underlying buffer here,
+  // but since we write the change to the buffer immediately, let skip
+  // this for now.
+  void prepare_write() final {}
+
+  // queries
+  static constexpr extent_types_t TYPE = extent_types_t::ONODE_BLOCK;
+  extent_types_t get_type() const final {
+    return TYPE;
+  }
+
+  // have to stash all the changes before on_delta_write() is called,
+  // otherwise we could pollute the extent with pending mutations
+  // before the transaction carrying these mutations is committed to
+  // disk
+  ceph::bufferlist get_delta() final;
+  void on_initial_write() final;
+  void on_delta_write(paddr_t record_block_offset) final;
+  void apply_delta(paddr_t base, ceph::bufferlist &bl) final;
+
+  void sync() {
+    apply_pending_changes(false);
+  }
+  void mutate(delta_t&& d);
+  using mutate_func_t = std::function<void (char*, const delta_t&)>;
+  void set_delta_applier(mutate_func_t&& func) {
+    mutate_func = std::move(func);
+  }
+private:
+  // before looking at the extent, we need to make sure the content is up to date
+  void apply_pending_changes(bool do_cleanup);
+  // assuming we don't stash too many deltas to a single block
+  // otherwise a fullwrite op is necessary
+  boost::container::small_vector<std::unique_ptr<delta_t>, 2> deltas;
+  mutate_func_t mutate_func;
+  bool share_buffer = false;
+};
+
+}

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index e98fa0c1d38449a8e1237036e125e6a8500ad1f4..50a82712644ae2c941baba051a481ad1d6738581 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -209,6 +209,7 @@ enum class extent_types_t : uint8_t {
   LADDR_INTERNAL = 2,
   LADDR_LEAF = 3,
   LBA_BLOCK = 4,
+  ONODE_BLOCK = 5,
 
   // Test Block Types
   TEST_BLOCK = 0xF0,