]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: print use_gmt_hitset in "ceph osd pool get"
authorKefu Chai <kchai@redhat.com>
Tue, 18 Aug 2015 08:53:50 +0000 (16:53 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 24 Mar 2016 11:54:50 +0000 (19:54 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cc2bcf760f2d2f20fc4a2fa78ba52475a23e55bf)

Conflicts:
src/mon/OSDMonitor.cc
use the old way to dump pool info

src/mon/OSDMonitor.cc

index 169dafb5f742bc4c11de407ccd314e6552048eae..39c17d36a52be3e4feb96a3790cf20afb523683a 100644 (file)
@@ -3068,6 +3068,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
     if (!p->is_tier() &&
         (var == "hit_set_type" || var == "hit_set_period" ||
          var == "hit_set_count" || var == "hit_set_fpp" ||
+        var == "use_gmt_hitset" ||
          var == "target_max_objects" || var == "target_max_bytes" ||
          var == "cache_target_full_ratio" ||
          var == "cache_target_dirty_ratio" ||
@@ -3120,6 +3121,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
          BloomHitSet::Params *bloomp = static_cast<BloomHitSet::Params*>(p->hit_set_params.impl.get());
          f->dump_float("hit_set_fpp", bloomp->get_fpp());
        }
+      } else if (var == "use_gmt_hitset") {
+       f->dump_bool("use_gmt_hitset", p->use_gmt_hitset);
       } else if (var == "target_max_objects") {
         f->dump_unsigned("target_max_objects", p->target_max_objects);
       } else if (var == "target_max_bytes") {
@@ -3177,6 +3180,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
        }
        BloomHitSet::Params *bloomp = static_cast<BloomHitSet::Params*>(p->hit_set_params.impl.get());
        ss << "hit_set_fpp: " << bloomp->get_fpp();
+      } else if (var == "use_gmt_hitset") {
+       ss << "use_gmt_hitset: " << p->use_gmt_hitset << "\n";
       } else if (var == "target_max_objects") {
         ss << "target_max_objects: " << p->target_max_objects;
       } else if (var == "target_max_bytes") {