]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
hobject_t: fix get_boundary to work with new sorting regime
authorSage Weil <sage@redhat.com>
Tue, 23 Dec 2014 19:03:17 +0000 (11:03 -0800)
committerSamuel Just <sjust@redhat.com>
Wed, 5 Aug 2015 18:18:40 +0000 (11:18 -0700)
The hash is no longer the most significant field; set everything that is
more significant, too.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 45281efad1ae6b2b5ddd5549c56dbdd46671e5c5)

src/common/hobject.h

index 07ceb3a15ac17c5eba47fdb879fdc3c28ed74284..7495cc1ffd17e6d6d397b54cc4da3d2024962543 100644 (file)
@@ -106,6 +106,7 @@ public:
       return *this;
     hobject_t ret;
     ret.set_hash(hash);
+    ret.pool = pool;
     return ret;
   }
 
@@ -289,6 +290,8 @@ public:
       return *this;
     ghobject_t ret;
     ret.hobj.set_hash(hobj.hash);
+    ret.shard_id = shard_id;
+    ret.hobj.pool = hobj.pool;
     return ret;
   }
   filestore_hobject_key_t get_filestore_key_u32() const {