From: Samuel Just <sam.just@inktank.com>
Date: Wed, 5 Mar 2014 20:51:08 +0000 (-0800)
Subject: PGBackend::rollback_stash: remove the correct shard
X-Git-Tag: v0.78~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1382%2Fhead;p=ceph.git

PGBackend::rollback_stash: remove the correct shard

Fixes: #7616
Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index f6698a1864de..19f3d997d0d9 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -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),