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

JounralingObjectStore: journal->committed_thru after replay

Browse Source 
It's possible that the osd stopped between when the filestore
op_seq file was updated and when the journal was trimmed.  In
that case, it's possible that on boot the journal might be
full, and yet not be trimmed because commit_start assumes
there is no work to do.  Calling committed_thru on the journal
ensures that the journal matches committed_seq.

Backport: giant firefly emperor dumpling
Fixes: #6756
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
This commit is contained in:
Sage Weil 2014-11-02 14:27:12 -08:00
parent 6fa686c8c4
commit 8924158df8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/FileJournal.cc
View File

@ -451,7 +451,6 @@ int FileJournal::open(uint64_t fs_op_seq)
{ {
dout(2) << "open " << fn << " fsid " << fsid << " fs_op_seq " << fs_op_seq << dendl; 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; uint64_t next_seq = fs_op_seq + 1;
int err = _open(false); int err = _open(false);
@ -510,6 +509,16 @@ int FileJournal::open(uint64_t fs_op_seq)
// find next entry // find next entry
read_pos = header.start; read_pos = header.start;
uint64_t seq = header.start_seq; 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;
if (last_committed_seq < fs_op_seq) {
dout(2) << "open advancing committed_seq " << last_committed_seq
<< " to fs op_seq " << fs_op_seq << dendl;
last_committed_seq = fs_op_seq;
}
while (1) { while (1) {
bufferlist bl; bufferlist bl;
off64_t old_pos = read_pos; off64_t old_pos = read_pos;