From 6c1fc6daa7af8a68de025553e65cc8d0b8930cb2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 4 Nov 2016 11:24:14 -0400 Subject: [PATCH] os: add objectstore_blackhole option; deprecate filestore_blackhole Signed-off-by: Sage Weil --- src/common/config_opts.h | 2 ++ src/os/filestore/FileStore.cc | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index a315ed83c0f..5354d2d0f84 100644 --- 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 97eb994acda..f0910f9e735 100644 --- a/src/os/filestore/FileStore.cc +++ b/src/os/filestore/FileStore.cc @@ -2054,8 +2054,10 @@ int FileStore::queue_transactions(Sequencer *posr, vector& 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; -- 2.39.5