andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix VerifyChecksum readahead with mmap mode

Browse Source 
Summary: A recent change introduced readahead inside VerifyChecksum(). However it is not compatible with mmap mode and generated wrong checksum verification failure. Fix it by not enabling readahead in mmap mode.

Test Plan: Add a new unit test which failed without the failure.
This commit is contained in:
sdong 2019-10-18 16:19:19 -07:00
parent 1f9d7c0f54
commit 772c07e65a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/corruption_test.cc
View File

@ -369,6 +369,12 @@ TEST_F(CorruptionTest, VerifyChecksumReadahead) {
ASSERT_GE(senv.random_read_counter_.Read(), 213);
ASSERT_LE(senv.random_read_counter_.Read(), 447);
// Test readahead shouldn't break mmap mode (where it should be
// disabled).
options.allow_mmap_reads = true;
Reopen(&options);
ASSERT_OK(dbi->VerifyChecksum(ro));
CloseDb();
}

5
table/block_based/block_based_table_reader.cc
View File

@ -3750,8 +3750,11 @@ Status BlockBasedTable::VerifyChecksumInBlocks(
size_t readahead_size = (read_options.readahead_size != 0)
? read_options.readahead_size
: kMaxAutoReadaheadSize;
// FilePrefetchBuffer doesn't work in mmap mode and readahead is not
// needed there.
FilePrefetchBuffer prefetch_buffer(rep_->file.get(), readahead_size,
readahead_size);
readahead_size,
!rep_->ioptions.allow_mmap_reads);
for (index_iter->SeekToFirst(); index_iter->Valid(); index_iter->Next()) {
s = index_iter->status();