From: Sage Weil <sage@redhat.com>
Date: Tue, 16 May 2017 19:10:09 +0000 (-0400)
Subject: mon/OSDMonitor: introduce debug option to allow filestore for ec overwrites
X-Git-Tag: v12.1.0~512^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b540b4299d6cc62f7aa83db81cc19658596b45df;p=ceph-ci.git

mon/OSDMonitor: introduce debug option to allow filestore for ec overwrites

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 405aeacf6d8..79a2e19c255 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -383,6 +383,7 @@ OPTION(mon_debug_dump_transactions, OPT_BOOL, false)
 OPTION(mon_debug_dump_json, OPT_BOOL, false)
 OPTION(mon_debug_dump_location, OPT_STR, "/var/log/ceph/$cluster-$name.tdump")
 OPTION(mon_debug_no_require_luminous, OPT_BOOL, false)
+OPTION(mon_debug_no_require_bluestore_for_ec_overwrites, OPT_BOOL, false)
 OPTION(mon_inject_transaction_delay_max, OPT_DOUBLE, 10.0)      // seconds
 OPTION(mon_inject_transaction_delay_probability, OPT_DOUBLE, 0) // range [0, 1]
 
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9b82b4a9f99..ea045056530 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -5994,7 +5994,8 @@ int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
       return -EINVAL;
     }
     stringstream err;
-    if (!is_pool_currently_all_bluestore(pool, p, &err)) {
+    if (!g_conf->mon_debug_no_require_bluestore_for_ec_overwrites &&
+	!is_pool_currently_all_bluestore(pool, p, &err)) {
       ss << "pool must only be stored on bluestore for scrubbing to work: " << err.str();
       return -EINVAL;
     }