From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 6 Jun 2019 20:06:58 +0000 (+0200)
Subject: os/memstore, crimson/os: introduce memstore_debug_omit_block_device_write.
X-Git-Tag: v15.1.0~2371^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d49c6be530f82dcb9743f1d465e5885f3bec91ac;p=ceph.git

os/memstore, crimson/os: introduce memstore_debug_omit_block_device_write.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 305ec25ed3f8..704059a833e5 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -891,6 +891,7 @@ OPTION(osd_discard_disconnected_ops, OPT_BOOL)
 OPTION(memstore_device_bytes, OPT_U64)
 OPTION(memstore_page_set, OPT_BOOL)
 OPTION(memstore_page_size, OPT_U64)
+OPTION(memstore_debug_omit_block_device_write, OPT_BOOL)
 
 OPTION(bdev_debug_inflight_ios, OPT_BOOL)
 OPTION(bdev_inject_crash, OPT_INT)  // if N>0, then ~ 1/N IOs will complete before we crash on flush.
diff --git a/src/common/options.cc b/src/common/options.cc
index 7fe98fa7c1ff..9a1eefd31f43 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4107,6 +4107,11 @@ std::vector<Option> get_global_options() {
     .set_default(64_K)
     .set_description(""),
 
+    Option("memstore_debug_omit_block_device_write", Option::TYPE_BOOL, Option::LEVEL_DEV)
+    .set_default(false)
+    .add_see_also("bluestore_debug_omit_block_device_write")
+    .set_description("write metadata only"),
+
     Option("objectstore_blackhole", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)
     .set_description(""),
diff --git a/src/crimson/os/cyan_store.cc b/src/crimson/os/cyan_store.cc
index 2486c5352146..60f73a419b4a 100644
--- a/src/crimson/os/cyan_store.cc
+++ b/src/crimson/os/cyan_store.cc
@@ -15,6 +15,8 @@ namespace {
   }
 }
 
+using ceph::common::local_conf;
+
 namespace ceph::os {
 
 using ObjectRef = boost::intrusive_ptr<Object>;
@@ -346,7 +348,7 @@ int CyanStore::_write(const coll_t& cid, const ghobject_t& oid,
     return -ENOENT;
 
   ObjectRef o = c->get_or_create_object(oid);
-  if (len > 0) {
+  if (len > 0 && !local_conf()->memstore_debug_omit_block_device_write) {
     const ssize_t old_size = o->get_size();
     o->write(offset, bl);
     used_bytes += (o->get_size() - old_size);
@@ -366,6 +368,8 @@ int CyanStore::_truncate(const coll_t& cid, const ghobject_t& oid, uint64_t size
   ObjectRef o = c->get_object(oid);
   if (!o)
     return -ENOENT;
+  if (local_conf()->memstore_debug_omit_block_device_write)
+    return 0;
   const ssize_t old_size = o->get_size();
   int r = o->truncate(size);
   used_bytes += (o->get_size() - old_size);
diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc
index dc1d5ff55abb..ee60b1556b07 100644
--- a/src/os/memstore/MemStore.cc
+++ b/src/os/memstore/MemStore.cc
@@ -1045,7 +1045,7 @@ int MemStore::_write(const coll_t& cid, const ghobject_t& oid,
     return -ENOENT;
 
   ObjectRef o = c->get_or_create_object(oid);
-  if (len > 0) {
+  if (len > 0 && !cct->_conf->memstore_debug_omit_block_device_write) {
     const ssize_t old_size = o->get_size();
     o->write(offset, bl);
     used_bytes += (o->get_size() - old_size);
@@ -1074,6 +1074,8 @@ int MemStore::_truncate(const coll_t& cid, const ghobject_t& oid, uint64_t size)
   ObjectRef o = c->get_object(oid);
   if (!o)
     return -ENOENT;
+  if (cct->_conf->memstore_debug_omit_block_device_write)
+    return 0;
   const ssize_t old_size = o->get_size();
   int r = o->truncate(size);
   used_bytes += (o->get_size() - old_size);