RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ReplicatedPG: handle removing the old object in finish_copy_op

Browse Source 
do_osd_ops will need to either copy the old version out of the
way or simply delete it depending on mod_desc.  Thus, defer
handling filling that part in until we finish the copy op.

Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2013-12-07 14:52:49 -08:00
parent f2384412cf
commit eb8f66d5d8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osd/ReplicatedPG.cc
View File

@ -5411,11 +5411,6 @@ void ReplicatedPG::_build_finish_copy_transaction(CopyOpRef cop,
PGBackend::PGTransaction* t)
{
ObjectState& obs = cop->obc->obs;
if (obs.exists) {
t->remove(obs.oi.soid);
}
if (cop->temp_cursor.is_initial()) {
// write directly to final object
cop->results.temp_oid = obs.oi.soid;
@ -5433,6 +5428,10 @@ void ReplicatedPG::finish_copyfrom(OpContext *ctx)
ObjectState& obs = ctx->new_obs;
CopyFromCallback *cb = static_cast<CopyFromCallback*>(ctx->copy_cb);
if (obs.exists) {
ctx->op_t->remove(obs.oi.soid);
}
if (!ctx->obs->exists) {
ctx->delta_stats.num_objects++;
obs.exists = true;