osd/OSDMap: use new object_locator_t::hash to place object in a pg

The hash value, is provided, becomes the ps (placement seed) portion of the
pg_t, skipping any hashing of the object name (or locator key).

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

1 files changed, 10 insertions, 6 deletions

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 8007d613b8c..8c424cadc77 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1006,13 +1006,17 @@ int OSDMap::object_locator_to_pg(
   if (!pool)
     return -ENOENT;
   ps_t ps;
-  string key;
-  if (!loc.key.empty())
-    key = make_hash_str(loc.key, loc.nspace);
-  else
-    key = make_hash_str(oid.name, loc.nspace);
+  if (loc.hash >= 0) {
+    string key;
+    if (!loc.key.empty())
+      key = make_hash_str(loc.key, loc.nspace);
+    else
+      key = make_hash_str(oid.name, loc.nspace);
 
-  ps = ceph_str_hash(pool->object_hash, key.c_str(), key.length());
+    ps = ceph_str_hash(pool->object_hash, key.c_str(), key.length());
+  } else {
+    ps = loc.hash;
+  }
   pg = pg_t(ps, loc.get_pool(), -1);
   return 0;
 }