vitalif
/
vitastor
5
4
Fork 9
Code Issues 1 Pull Requests 2 Actions Releases 69 Wiki Activity

Die when journal_sector_buffer_count is too small

trace-sqes
Vitaliy Filippov 2020-05-24 17:22:12 +03:00
parent 36595eb669
commit 53f6aba3e6
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
blockstore_journal.cpp
View File

@ -6,18 +6,24 @@ blockstore_journal_check_t::blockstore_journal_check_t(blockstore_impl_t *bs)
sectors_required = 0; sectors_required = 0;
next_pos = bs->journal.next_free; next_pos = bs->journal.next_free;
next_sector = bs->journal.cur_sector; next_sector = bs->journal.cur_sector;
first_sector = -1;
next_in_pos = bs->journal.in_sector_pos; next_in_pos = bs->journal.in_sector_pos;
right_dir = next_pos >= bs->journal.used_start; right_dir = next_pos >= bs->journal.used_start;
} }
// Check if we can write <required> entries of <size> bytes and <data_after> data bytes after them to the journal // Check if we can write <required> entries of <size> bytes and <data_after> data bytes after them to the journal
int blockstore_journal_check_t::check_available(blockstore_op_t *op, int required, int size, int data_after) int blockstore_journal_check_t::check_available(blockstore_op_t *op, int entries_required, int size, int data_after)
{ {
int required = entries_required;
while (1) while (1)
{ {
int fits = (bs->journal.block_size - next_in_pos) / size; int fits = (bs->journal.block_size - next_in_pos) / size;
if (fits > 0) if (fits > 0)
{ {
if (first_sector == -1)
{
first_sector = next_sector;
}
required -= fits; required -= fits;
next_in_pos += fits * size; next_in_pos += fits * size;
sectors_required++; sectors_required++;
@ -38,10 +44,15 @@ int blockstore_journal_check_t::check_available(blockstore_op_t *op, int require
right_dir = false; right_dir = false;
} }
next_in_pos = 0; next_in_pos = 0;
if (bs->journal.sector_info[next_sector].usage_count > 0 || next_sector = ((next_sector + 1) % bs->journal.sector_count);
bs->journal.sector_info[next_sector].dirty) if (next_sector == first_sector)
{ {
next_sector = ((next_sector + 1) % bs->journal.sector_count); // next_sector may wrap when all sectors are flushed and the incoming batch is too big
// This is an error condition, we can't wait for anything in this case
throw std::runtime_error(
"Blockstore journal_sector_buffer_count="+std::to_string(bs->journal.sector_count)+
" is too small for a batch of "+std::to_string(entries_required)+" entries of "+std::to_string(size)+" bytes"
);
} }
if (bs->journal.sector_info[next_sector].usage_count > 0 || if (bs->journal.sector_info[next_sector].usage_count > 0 ||
bs->journal.sector_info[next_sector].dirty) bs->journal.sector_info[next_sector].dirty)
@ -107,6 +118,7 @@ journal_entry* prefill_single_journal_entry(journal_t & journal, uint16_t type,
{ {
// Also select next sector buffer in memory // Also select next sector buffer in memory
journal.cur_sector = ((journal.cur_sector + 1) % journal.sector_count); journal.cur_sector = ((journal.cur_sector + 1) % journal.sector_count);
assert(!journal.sector_info[journal.cur_sector].usage_count);
} }
else else
{ {

2
blockstore_journal.h
View File

@ -166,7 +166,7 @@ struct blockstore_journal_check_t
{ {
blockstore_impl_t *bs; blockstore_impl_t *bs;
uint64_t next_pos, next_sector, next_in_pos; uint64_t next_pos, next_sector, next_in_pos;
int sectors_required; int sectors_required, first_sector;
bool right_dir; // writing to the end or the beginning of the ring buffer bool right_dir; // writing to the end or the beginning of the ring buffer
blockstore_journal_check_t(blockstore_impl_t *bs); blockstore_journal_check_t(blockstore_impl_t *bs);

2
osd_primary_subops.cpp
View File

@ -2,6 +2,8 @@
void osd_t::autosync() void osd_t::autosync()
{ {
// FIXME Autosync based on the number of unstable writes to prevent
// "journal_sector_buffer_count is too low for this batch" errors
if (immediate_commit != IMMEDIATE_ALL && !autosync_op) if (immediate_commit != IMMEDIATE_ALL && !autosync_op)
{ {
autosync_op = new osd_op_t(); autosync_op = new osd_op_t();