]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PGBackend::rollback_stash: remove the correct shard 1382/head
authorSamuel Just <sam.just@inktank.com>
Wed, 5 Mar 2014 20:51:08 +0000 (12:51 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 5 Mar 2014 20:53:08 +0000 (12:53 -0800)
Fixes: #7616
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/PGBackend.cc

index f6698a1864de94c8cb87d18cd3d47e8249f8988b..19f3d997d0d9f1b31c5329700476c57e563e75d3 100644 (file)
@@ -235,7 +235,9 @@ void PGBackend::rollback_stash(
   version_t old_version,
   ObjectStore::Transaction *t) {
   assert(!hoid.is_temp());
-  t->remove(coll, hoid);
+  t->remove(
+    coll,
+    ghobject_t(hoid, ghobject_t::NO_GEN, get_parent()->whoami_shard().shard));
   t->collection_move_rename(
     coll,
     ghobject_t(hoid, old_version, get_parent()->whoami_shard().shard),