os: add objectstore_blackhole option; deprecate filestore_blackhole

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index a315ed83c0f29ef81cec4d04b21674d65ec50690..5354d2d0f847d0068a9e701014d0953b34d712a3 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -945,6 +945,8 @@ OPTION(bdev_block_size, OPT_INT, 4096)
 OPTION(bdev_nvme_unbind_from_kernel, OPT_BOOL, false)
 OPTION(bdev_nvme_retry_count, OPT_INT, -1) // -1 means by default which is 4
 
+OPTION(objectstore_blackhole, OPT_BOOL, false)
+
 OPTION(bluefs_alloc_size, OPT_U64, 1048576)
 OPTION(bluefs_max_prefetch, OPT_U64, 1048576)
 OPTION(bluefs_min_log_runway, OPT_U64, 1048576)  // alloc when we get this low

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 97eb994acda78a8ac60d390a00f9e09fffefb848..f0910f9e7352125574038ecfa94935fe5635e0d3 100644 (file)
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -2054,8 +2054,10 @@ int FileStore::queue_transactions(Sequencer *posr, vector<Transaction>& tls,
   Context *onreadable_sync;
   ObjectStore::Transaction::collect_contexts(
     tls, &onreadable, &ondisk, &onreadable_sync);
-  if (g_conf->filestore_blackhole) {
-    dout(0) << "queue_transactions filestore_blackhole = TRUE, dropping transaction" << dendl;
+
+  if (g_conf->objectstore_blackhole) {
+    dout(0) << __func__ << " objectstore_blackhole = TRUE, dropping transaction"
+           << dendl;
     delete ondisk;
     delete onreadable;
     delete onreadable_sync;