From 68c44cbbdcdcdf0e1df88102507cc6d99b07d98e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 4 Dec 2013 14:41:04 -0800 Subject: [PATCH] mon/OSDMonitor: non-zero default bloom fpp Signed-off-by: Sage Weil --- src/common/bloom_filter.hpp | 1 + src/mon/OSDMonitor.cc | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/bloom_filter.hpp b/src/common/bloom_filter.hpp index 34e559f219901..36b8ede631a25 100644 --- a/src/common/bloom_filter.hpp +++ b/src/common/bloom_filter.hpp @@ -80,6 +80,7 @@ public: target_element_count_(predicted_inserted_element_count), random_seed_((random_seed) ? random_seed : 0xA5A5A5A5) { + assert(false_positive_probability > 0.0); find_optimal_parameters(predicted_inserted_element_count, false_positive_probability, &salt_count_, &table_size_); init(); diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 43d3acffc5aab..bbd8cf0f80596 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2841,9 +2841,11 @@ int OSDMonitor::prepare_command_pool_set(map &cmdmap, } else if (var == "hit_set_type") { if (val == "none") p.hit_set_params = HitSet::Params(); - else if (val == "bloom") - p.hit_set_params = HitSet::Params(new BloomHitSet::Params); - else if (val == "explicit_hash") + else if (val == "bloom") { + BloomHitSet::Params *bsp = new BloomHitSet::Params; + bsp->false_positive = .01; + p.hit_set_params = HitSet::Params(bsp); + } else if (val == "explicit_hash") p.hit_set_params = HitSet::Params(new ExplicitHashHitSet::Params); else if (val == "explicit_object") p.hit_set_params = HitSet::Params(new ExplicitObjectHitSet::Params); -- 2.39.5