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

ReplicatedPG: take clone write lock as well in make_writeable

Browse Source 
Otherwise, we might start backfilling the clone before the op is
complete.

Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2014-02-10 18:34:52 -08:00
parent 643b6a50ae
commit d687ed96fd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osd/ReplicatedPG.cc
View File

@ -4622,6 +4622,8 @@ void ReplicatedPG::make_writeable(OpContext *ctx)
if (pool.info.require_rollback())
ctx->clone_obc->attr_cache = ctx->obc->attr_cache;
snap_oi = &ctx->clone_obc->obs.oi;
bool got = ctx->clone_obc->get_write(ctx->op);
assert(got);
} else {
snap_oi = &static_snap_oi;
}

5
src/osd/ReplicatedPG.h
View File

@ -629,10 +629,13 @@ protected:
void release_op_ctx_locks(OpContext *ctx) {
list<OpRequestRef> to_req;
bool requeue_recovery = false;
bool requeue_recovery_clone = false;
switch (ctx->lock_to_release) {
case OpContext::W_LOCK:
ctx->obc->put_write(&to_req, &requeue_recovery);
if (requeue_recovery)
if (ctx->clone_obc)
ctx->clone_obc->put_write(&to_req, &requeue_recovery_clone);
if (requeue_recovery || requeue_recovery_clone)
osd->recovery_wq.queue(this);
break;
case OpContext::R_LOCK: