]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: disable gmt_hitset if not supported
authorKefu Chai <kchai@redhat.com>
Tue, 8 Sep 2015 08:52:32 +0000 (16:52 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 9 Oct 2015 10:20:32 +0000 (03:20 -0700)
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 <kchai@redhat.com>
(cherry picked from commit e48cec3dc93b3988dcd8924933deb1b3a43e1d0f)

Conflicts:
src/mon/OSDMonitor.cc
remove unrelated hunk

src/mon/OSDMonitor.cc

index 5c20dd1e9f2337b12c74aad871de67987493ab9f..56a227e1b575cb1da0e0e8f7d290ae838ad43b97 100644 (file)
@@ -4100,6 +4100,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;