RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: fix re-entrant calls into Journaler from PurgeQueue

Browse Source 
Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2017-06-15 09:17:20 -04:00
parent 93f8d4a78c
commit 8bc96561f3
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mds/PurgeQueue.cc
View File

@ -445,21 +445,12 @@ void PurgeQueue::_execute_item(
}
assert(gather.has_subs());
gather.set_finisher(new FunctionContext([this, expire_to](int r){
if (lock.is_locked_by_me()) {
// Fast completion, Objecter ops completed before we hit gather.activate()
// and we're being called inline. We are still inside _consume so
// no need to call back into it.
_execute_item_complete(expire_to);
} else {
// Normal completion, we're being called back from outside PurgeQueue::lock
// by the Objecter. Take the lock, and call back into _consume to
// find more work.
Mutex::Locker l(lock);
_execute_item_complete(expire_to);
gather.set_finisher(new C_OnFinisher(
new FunctionContext([this, expire_to](int r){
Mutex::Locker l(lock);
_execute_item_complete(expire_to);
_consume();
}
_consume();
// Have we gone idle? If so, do an extra write_head now instead of
// waiting for next flush after journaler_write_head_interval.
@ -471,7 +462,8 @@ void PurgeQueue::_execute_item(
journaler.trim();
}));
}
}));
}), &finisher));
gather.activate();
}