From: Sage Weil <sage@redhat.com>
Date: Thu, 11 Jul 2019 22:21:23 +0000 (-0500)
Subject: osd/SnapMapper: to_raw_key: use hobject pool member, not SnapMapper:pool
X-Git-Tag: v15.1.0~2215^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16b9b8f885613178266006ba1d2c58978e881b51;p=ceph.git

osd/SnapMapper: to_raw_key: use hobject pool member, not SnapMapper:pool

Some callers (ceph-objectstore-tool) instantiate SnapMapper with a bogus
pool id (0) and want to use it to adjust mappings.  We have the hobj
available, so use its pool member instead.

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

diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc
index b6eb7ec4b0ae..d61b43decc61 100644
--- a/src/osd/SnapMapper.cc
+++ b/src/osd/SnapMapper.cc
@@ -102,7 +102,7 @@ string SnapMapper::get_prefix(int64_t pool, snapid_t snap)
 string SnapMapper::to_raw_key(
   const pair<snapid_t, hobject_t> &in)
 {
-  return get_prefix(pool, in.first) + shard_prefix + in.second.to_str();
+  return get_prefix(in.second.pool, in.first) + shard_prefix + in.second.to_str();
 }
 
 pair<string, bufferlist> SnapMapper::to_raw(