summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2014-03-12 10:46:54 -0700
committerSage Weil <sage@inktank.com>2014-03-12 10:46:54 -0700
commitbcd41c0fad6578959ffae4f4c1289284880f5466 (patch)
tree644c027454ee0b33530b850ff3293effc8f6e0c2
parentf52af3063e1cb49d7b4e57ff2c5fa6a51f41a2d0 (diff)
parent980d2b59e4bb4685fdbe1cd0ff14cacc152b251a (diff)
downloadceph-bcd41c0fad6578959ffae4f4c1289284880f5466.tar.gz
Merge pull request #1436 from ceph/wip-7681
ECBackend: when removing the temp obj, use the right shard Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/osd/ECBackend.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 65dcacbdde0..5738ab3790a 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -807,7 +807,12 @@ void ECBackend::handle_sub_write(
++i) {
dout(10) << __func__ << ": removing object " << *i
<< " since we won't get the transaction" << dendl;
- localt->remove(temp_coll, *i);
+ localt->remove(
+ temp_coll,
+ ghobject_t(
+ *i,
+ ghobject_t::NO_GEN,
+ get_parent()->whoami_shard().shard));
}
}
clear_temp_objs(op.temp_removed);