osd/ReplicatedPG: put hit_set objects in a configurable namespace

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index dea23bae02f938b37f8aac8a2f9249ac5c0d1efe..1efa6670ae0ac94d7af82b03f721fb39234abcf1 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -394,6 +394,7 @@ OPTION(osd_pool_default_pgp_num, OPT_INT, 8) // number of PGs for placement purp
 OPTION(osd_pool_default_flags, OPT_INT, 0)   // default flags for new pools
 OPTION(osd_pool_default_flag_hashpspool, OPT_BOOL, false)   // use new pg hashing to prevent pool/pg overlap
 OPTION(osd_hit_set_min_size, OPT_INT, 1000)  // min target size for a HitSet
+OPTION(osd_hit_set_namespace, OPT_STR, ".ceph-internal") // rados namespace for hit_set tracking
 OPTION(osd_map_dedup, OPT_BOOL, true)
 OPTION(osd_map_cache_size, OPT_INT, 500)
 OPTION(osd_map_message_max, OPT_INT, 100)  // max maps per MOSDMap message

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 69cf38bc99e9ba4f9e89ed90b216b5dba91141f5..8b8c6ad6e319fa28836b53af4257e39d5c5eed90 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -8457,7 +8457,8 @@ hobject_t ReplicatedPG::get_hit_set_current_object(utime_t stamp)
   ostringstream ss;
   ss << "hit_set_" << info.pgid << "_current_" << stamp;
   hobject_t hoid(sobject_t(ss.str(), CEPH_NOSNAP), "",
-                info.pgid.ps(), info.pgid.pool(), "");
+                info.pgid.ps(), info.pgid.pool(),
+                cct->_conf->osd_hit_set_namespace);
   dout(20) << __func__ << " " << hoid << dendl;
   return hoid;
 }
@@ -8467,7 +8468,8 @@ hobject_t ReplicatedPG::get_hit_set_archive_object(utime_t start, utime_t end)
   ostringstream ss;
   ss << "hit_set_" << info.pgid << "_archive_" << start << "_" << end;
   hobject_t hoid(sobject_t(ss.str(), CEPH_NOSNAP), "",
-                info.pgid.ps(), info.pgid.pool(), "");
+                info.pgid.ps(), info.pgid.pool(),
+                cct->_conf->osd_hit_set_namespace);
   dout(20) << __func__ << " " << hoid << dendl;
   return hoid;
 }