From 720a090eb67b3955b0cadb7633c5a28a934171a4 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 8 Sep 2015 16:52:32 +0800 Subject: [PATCH] mon: disable gmt_hitset if not supported the gmt_hitset is enabled by default in the ctor of pg_pool_t, this is intentional. because we want to remove this setting and make gmt_hitset=true as a default in future. but this forces us to disable it explicitly when preparing a new pool if any OSD does not support gmt hitset. Fixes: #12968 Signed-off-by: Kefu Chai (cherry picked from commit e48cec3dc93b3988dcd8924933deb1b3a43e1d0f) Conflicts: src/mon/OSDMonitor.cc remove unrelated hunk --- src/mon/OSDMonitor.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 39c17d36a52be..83769f9dff175 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -4067,6 +4067,9 @@ int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, if (g_conf->osd_pool_use_gmt_hitset && (osdmap.get_up_osd_features() & CEPH_FEATURE_OSD_HITSET_GMT)) pi->use_gmt_hitset = true; + else + pi->use_gmt_hitset = false; + pi->size = size; pi->min_size = min_size; pi->crush_ruleset = crush_ruleset; -- 2.39.5