bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

commitlog: Fix allocation size check to take sector overhead into account.

Browse Source 
Fixes #16301

The calculation on whether data may be added is based on position vs. size of incoming data.
However, it did not take sector overhead into account, which lead us to writing past allowed
segment end, which in turn also leads to metrics overflows.
This commit is contained in:
Calle Wilund
2023-12-06 03:08:55 +00:00
parent 0d35c96ef4
commit dba39b47bd
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db/commitlog/commitlog.cc
View File

@@ -1253,7 +1253,7 @@ public:
_segment_manager->sanity_check_size(s);
if (!is_still_allocating() || position() + s > _segment_manager->max_size) { // would we make the file too big?
if (!is_still_allocating() || next_position(s) > _segment_manager->max_size) { // would we make the file too big?
return write_result::no_space;
} else if (!_buffer.empty() && (s > _buffer_ostream.size())) { // enough data?
if (_segment_manager->cfg.mode == sync_mode::BATCH || writer.sync) {
@@ -1342,6 +1342,12 @@ public:
return position_type(_file_pos + buffer_position());
}
position_type next_position(size_t size) const {
auto used = _buffer_ostream_size - _buffer_ostream.size();
used += size;
return _file_pos + used + sector_overhead(used);
}
size_t file_position() const {
return _file_pos;
}