RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: set committing_seq in commit_start

Browse Source 
We need to set committing_seq when we first block access to the
fs in commit_start(), NOT in commit_started(), as by that time
we may have queued all sorts of additional entries for the
journal.  The committing_seq is all about syncing up with the
live fs (via op_apply_start), not what's queued for the journal.
This commit is contained in:
Sage Weil 2010-03-03 09:47:00 -08:00
parent 5fa2083f49
commit d844ddee5d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/JournalingObjectStore.cc
View File

@ -152,16 +152,16 @@ bool JournalingObjectStore::commit_start()
assert(commit_waiters.empty());
return false;
}
dout(10) << "commit_start" << dendl;
committing_seq = op_seq;
dout(10) << "commit_start committing " << committing_seq << ", blocked" << dendl;
return true;
}
void JournalingObjectStore::commit_started()
{
Mutex::Locker l(lock);
dout(10) << "commit_started" << dendl;
// allow new ops. (underlying fs should now be committing all prior ops)
committing_seq = op_seq;
dout(10) << "commit_started committing " << committing_seq << ", unblocking" << dendl;
blocked = false;
cond.Signal();
}
@ -169,7 +169,7 @@ void JournalingObjectStore::commit_started()
void JournalingObjectStore::commit_finish()
{
Mutex::Locker l(lock);
dout(10) << "commit_finish" << dendl;
dout(10) << "commit_finish thru " << committing_seq << dendl;
if (journal)
journal->committed_thru(committing_seq);