RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "JounralingObjectStore: journal->committed_thru after replay"

Browse Source 
committed_thru can race with the sync thread.

This reverts commit d8d27f13e1.
Reviewed-by: Greg Farnum <greg@inktank.com>
This commit is contained in:
Samuel Just 2013-11-18 12:57:39 -08:00
parent 878f3540d1
commit 703f9a09e2
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/FileJournal.cc
View File

@ -469,6 +469,7 @@ int FileJournal::open(uint64_t fs_op_seq)
{
dout(2) << "open " << fn << " fsid " << fsid << " fs_op_seq " << fs_op_seq << dendl;
last_committed_seq = fs_op_seq;
uint64_t next_seq = fs_op_seq + 1;
int err = _open(false);
@ -527,11 +528,6 @@ int FileJournal::open(uint64_t fs_op_seq)
// find next entry
read_pos = header.start;
uint64_t seq = header.start_seq;
// last_committed_seq is 1 before the start of the journal or
// 0 if the start is 0
last_committed_seq = seq > 0 ? seq - 1 : seq;
while (1) {
bufferlist bl;
off64_t old_pos = read_pos;

2
src/os/JournalingObjectStore.cc
View File

@ -100,8 +100,6 @@ int JournalingObjectStore::journal_replay(uint64_t fs_op_seq)
// done reading, make writeable.
journal->make_writeable();
journal->committed_thru(fs_op_seq);
return count;
}