Merge PR #29717 into master

* refs/pull/29717/head: os/bluestore: prefix omap of temp objects by real pool Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Aug 20, 2019 · 11e1c96 · 11e1c96
2 parents 76bfe8a + e924b84
commit 11e1c96
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
@@ -3289,7 +3289,7 @@ const string& BlueStore::Onode::get_omap_prefix()
 void BlueStore::Onode::get_omap_header(string *out)
 {
   if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
-    _key_encode_u64(oid.hobj.pool, out);
+    _key_encode_u64(c->pool(), out);
   }
   _key_encode_u64(onode.nid, out);
   out->push_back('-');
@@ -3298,7 +3298,7 @@ void BlueStore::Onode::get_omap_header(string *out)
 void BlueStore::Onode::get_omap_key(const string& key, string *out)
 {
   if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
-    _key_encode_u64(oid.hobj.pool, out);
+    _key_encode_u64(c->pool(), out);
   }
   _key_encode_u64(onode.nid, out);
   out->push_back('.');
@@ -3308,7 +3308,7 @@ void BlueStore::Onode::get_omap_key(const string& key, string *out)
 void BlueStore::Onode::rewrite_omap_key(const string& old, string *out)
 {
   if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
-    _key_encode_u64(oid.hobj.pool, out);
+    _key_encode_u64(c->pool(), out);
   }
   _key_encode_u64(onode.nid, out);
   out->append(old.c_str() + out->length(), old.size() - out->length());
@@ -3317,7 +3317,7 @@ void BlueStore::Onode::rewrite_omap_key(const string& old, string *out)
 void BlueStore::Onode::get_omap_tail(string *out)
 {
   if (onode.is_perpool_omap() && !onode.is_pgmeta_omap()) {
-    _key_encode_u64(oid.hobj.pool, out);
+    _key_encode_u64(c->pool(), out);
   }
   _key_encode_u64(onode.nid, out);
   out->push_back('~');

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
@@ -1292,6 +1292,10 @@ class BlueStore : public ObjectStore,
       return false;
     }
 
+    int64_t pool() const {
+      return cid.pool();
+    }
+
     void split_cache(Collection *dest);
 
     bool flush_commit(Context *c) override;

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
@@ -742,6 +742,9 @@ class coll_t {
     }
     return false;
   }
+  int64_t pool() const {
+    return pgid.pool();
+  }
 
   void encode(ceph::buffer::list& bl) const;
   void decode(ceph::buffer::list::const_iterator& bl);