Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

osd: FileJournal: fix journalq population in do_read_entry() #3960

Merged
1 commit merged into from Mar 16, 2015
Merged

osd: FileJournal: fix journalq population in do_read_entry() #3960

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 17 additions & 16 deletions src/os/FileJournal.cc
View file
Open in desktop
Expand Up @@ -1712,13 +1712,14 @@ bool FileJournal::read_entry(
}

FileJournal::read_entry_result FileJournal::do_read_entry(
off64_t pos,
off64_t init_pos,
off64_t *next_pos,
bufferlist *bl,
uint64_t *seq,
ostream *ss,
entry_header_t *_h)
{
off64_t cur_pos = init_pos;
bufferlist _bl;
if (!bl)
bl = &_bl;
Expand All @@ -1727,40 +1728,40 @@ FileJournal::read_entry_result FileJournal::do_read_entry(
entry_header_t *h;
bufferlist hbl;
off64_t _next_pos;
wrap_read_bl(pos, sizeof(*h), &hbl, &_next_pos);
wrap_read_bl(cur_pos, sizeof(*h), &hbl, &_next_pos);
h = (entry_header_t *)hbl.c_str();

if (!h->check_magic(pos, header.get_fsid64())) {
dout(25) << "read_entry " << pos
if (!h->check_magic(cur_pos, header.get_fsid64())) {
dout(25) << "read_entry " << init_pos
<< " : bad header magic, end of journal" << dendl;
if (ss)
*ss << "bad header magic";
if (next_pos)
*next_pos = pos + (4<<10); // check 4k ahead
*next_pos = init_pos + (4<<10); // check 4k ahead
return MAYBE_CORRUPT;
}
pos = _next_pos;
cur_pos = _next_pos;

// pad + body + pad
if (h->pre_pad)
pos += h->pre_pad;
cur_pos += h->pre_pad;

bl->clear();
wrap_read_bl(pos, h->len, bl, &pos);
wrap_read_bl(cur_pos, h->len, bl, &cur_pos);

if (h->post_pad)
pos += h->post_pad;
cur_pos += h->post_pad;

// footer
entry_header_t *f;
bufferlist fbl;
wrap_read_bl(pos, sizeof(*f), &fbl, &pos);
wrap_read_bl(cur_pos, sizeof(*f), &fbl, &cur_pos);
f = (entry_header_t *)fbl.c_str();
if (memcmp(f, h, sizeof(*f))) {
if (ss)
*ss << "bad footer magic, partial entry";
if (next_pos)
*next_pos = pos;
*next_pos = cur_pos;
return MAYBE_CORRUPT;
}

Expand All @@ -1772,13 +1773,13 @@ FileJournal::read_entry_result FileJournal::do_read_entry(
*ss << "header crc (" << h->crc32c
<< ") doesn't match body crc (" << actual_crc << ")";
if (next_pos)
*next_pos = pos;
*next_pos = cur_pos;
return MAYBE_CORRUPT;
}
}

// yay!
dout(2) << "read_entry " << pos << " : seq " << h->seq
dout(2) << "read_entry " << init_pos << " : seq " << h->seq
<< " " << h->len << " bytes"
<< dendl;

Expand All @@ -1790,15 +1791,15 @@ FileJournal::read_entry_result FileJournal::do_read_entry(
// bind by reference to (packed) h->seq
journalq.push_back(
pair<uint64_t,off64_t>(static_cast<uint64_t>(h->seq),
static_cast<off64_t>(pos)));
static_cast<off64_t>(init_pos)));

if (next_pos)
*next_pos = pos;
*next_pos = cur_pos;

if (_h)
*_h = *h;

assert(pos % header.alignment == 0);
assert(cur_pos % header.alignment == 0);
return SUCCESS;
}

Expand Down