Skip to content

Commit 0698598

Browse files
ajkrfacebook-github-bot
authored andcommitted
Fix scope of ReadOptions in SstFileReader (#7432)
Summary: a4a4a2d changed the contract of `TableReader::NewIterator()` to require `ReadOptions` outlive the returned iterator. But I didn't notice that `SstFileReader` violates the new contract and needs to be adapted. The unit test provided here exposes the problem when run under ASAN. ``` $ ./sst_file_reader_test --gtest_filter=SstFileReaderTest.ReadOptionsOutOfScope Note: Google Test filter = SstFileReaderTest.ReadOptionsOutOfScope [==========] Running 1 test from 1 test case. [----------] Global test environment set-up. [----------] 1 test from SstFileReaderTest [ RUN ] SstFileReaderTest.ReadOptionsOutOfScope ================================================================= ==3238048==ERROR: AddressSanitizer: stack-use-after-scope on address 0x7ffd6189e158 at pc 0x000001298350 bp 0x7ffd6189c280 sp 0x7ffd6189c278 READ of size 8 at 0x7ffd6189e158 thread T0 #0 0x129834f in rocksdb::BlockBasedTableIterator::InitDataBlock() table/block_based/block_based_table_iterator.cc:236 #1 0x12b01f7 in rocksdb::BlockBasedTableIterator::SeekImpl(rocksdb::Slice const*) table/block_based/block_based_table_iterator.cc:77 #2 0x844d28 in rocksdb::IteratorWrapperBase<rocksdb::Slice>::SeekToFirst() table/iterator_wrapper.h:116 #3 0x844d28 in rocksdb::DBIter::SeekToFirst() db/db_iter.cc:1352 #4 0x52482b in rocksdb::SstFileReaderTest_ReadOptionsOutOfScope_Test::TestBody() table/sst_file_reader_test.cc:150 #5 0x5f433c in void testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:3899 #6 0x5f433c in void testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:3935 #7 0x5cc2de in testing::Test::Run() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:3973 #8 0x5cc988 in testing::Test::Run() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:3965 #9 0x5cc988 in testing::TestInfo::Run() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:4149 #10 0x5cce9a in testing::TestInfo::Run() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:4124 #11 0x5cce9a in testing::TestCase::Run() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:4267 #12 0x5ce696 in testing::TestCase::Run() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:4253 #13 0x5ce696 in testing::internal::UnitTestImpl::RunAllTests() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:6633 #14 0x5f541c in bool testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:3899 #15 0x5f541c in bool testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:3935 #16 0x5cee74 in testing::UnitTest::Run() third-party/gtest-1.8.1/fused-src/gtest/gtest-all.cc:6242 #17 0x4c0332 in RUN_ALL_TESTS() third-party/gtest-1.8.1/fused-src/gtest/gtest.h:22104 #18 0x4c0332 in main table/sst_file_reader_test.cc:213 #19 0x7fb0263281a5 in __libc_start_main (/usr/local/fbcode/platform007/lib/libc.so.6+0x211a5) #20 0x523e56 (/data/users/andrewkr/rocksdb/sst_file_reader_test+0x523e56) Address 0x7ffd6189e158 is located in stack of thread T0 at offset 568 in frame #0 0x52428f in rocksdb::SstFileReaderTest_ReadOptionsOutOfScope_Test::TestBody() table/sst_file_reader_test.cc:131 This frame has 9 object(s): [32, 40) 'reader' [96, 104) '<unknown>' [160, 168) '<unknown>' [224, 232) 'iter' [288, 304) 'gtest_ar' [352, 368) '<unknown>' [416, 440) 'keys' [480, 512) '<unknown>' [544, 680) 'ropts' <== Memory access at offset 568 is inside this variable HINT: this may be a false positive if your program uses some custom stack unwind mechanism or swapcontext (longjmp and C++ exceptions *are* supported) AddressSanitizer: stack-use-after-scope table/block_based/block_based_table_iterator.cc:236 in rocksdb::BlockBasedTableIterator::InitDataBlock() ... ``` The fix is to use `ArenaWrappedDBIter` which has support for holding a `ReadOptions` in an `Arena` whose lifetime is tied to the iterator. Pull Request resolved: #7432 Test Plan: verified the provided unit test no longer fails Reviewed By: pdillinger Differential Revision: D23880043 Pulled By: ajkr fbshipit-source-id: 9464c37408f7bd7c9c4a90ceffb04d9f0ca7a494
1 parent 6980fff commit 0698598

File tree

2 files changed

+40
-9
lines changed

2 files changed

+40
-9
lines changed

table/sst_file_reader.cc

+15-9
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "rocksdb/sst_file_reader.h"
99

10+
#include "db/arena_wrapped_db_iter.h"
1011
#include "db/db_iter.h"
1112
#include "db/dbformat.h"
1213
#include "env/composite_env_wrapper.h"
@@ -62,18 +63,23 @@ Status SstFileReader::Open(const std::string& file_path) {
6263
return s;
6364
}
6465

65-
Iterator* SstFileReader::NewIterator(const ReadOptions& options) {
66+
Iterator* SstFileReader::NewIterator(const ReadOptions& roptions) {
6667
auto r = rep_.get();
67-
auto sequence = options.snapshot != nullptr
68-
? options.snapshot->GetSequenceNumber()
68+
auto sequence = roptions.snapshot != nullptr
69+
? roptions.snapshot->GetSequenceNumber()
6970
: kMaxSequenceNumber;
71+
ArenaWrappedDBIter* res = new ArenaWrappedDBIter();
72+
res->Init(r->options.env, roptions, r->ioptions, r->moptions, sequence,
73+
r->moptions.max_sequential_skip_in_iterations,
74+
0 /* version_number */, nullptr /* read_callback */,
75+
nullptr /* db_impl */, nullptr /* cfd */, false /* allow_blob */,
76+
false /* allow_refresh */);
7077
auto internal_iter = r->table_reader->NewIterator(
71-
options, r->moptions.prefix_extractor.get(), /*arena=*/nullptr,
72-
/*skip_filters=*/false, TableReaderCaller::kSSTFileReader);
73-
return NewDBIterator(r->options.env, options, r->ioptions, r->moptions,
74-
r->ioptions.user_comparator, internal_iter, sequence,
75-
r->moptions.max_sequential_skip_in_iterations,
76-
nullptr /* read_callback */);
78+
res->GetReadOptions(), r->moptions.prefix_extractor.get(),
79+
res->GetArena(), false /* skip_filters */,
80+
TableReaderCaller::kSSTFileReader);
81+
res->SetIterUnderDBIter(internal_iter);
82+
return res;
7783
}
7884

7985
std::shared_ptr<const TableProperties> SstFileReader::GetTableProperties()

table/sst_file_reader_test.cc

+25
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,31 @@ TEST_F(SstFileReaderTest, Uint64Comparator) {
128128
CreateFileAndCheck(keys);
129129
}
130130

131+
TEST_F(SstFileReaderTest, ReadOptionsOutOfScope) {
132+
// Repro a bug where the SstFileReader depended on its configured ReadOptions
133+
// outliving it.
134+
options_.comparator = test::Uint64Comparator();
135+
std::vector<std::string> keys;
136+
for (uint64_t i = 0; i < kNumKeys; i++) {
137+
keys.emplace_back(EncodeAsUint64(i));
138+
}
139+
CreateFile(sst_name_, keys);
140+
141+
SstFileReader reader(options_);
142+
ASSERT_OK(reader.Open(sst_name_));
143+
std::unique_ptr<Iterator> iter;
144+
{
145+
// Make sure ReadOptions go out of scope ASAP so we know the iterator
146+
// operations do not depend on it.
147+
ReadOptions ropts;
148+
iter.reset(reader.NewIterator(ropts));
149+
}
150+
iter->SeekToFirst();
151+
while (iter->Valid()) {
152+
iter->Next();
153+
}
154+
}
155+
131156
TEST_F(SstFileReaderTest, ReadFileWithGlobalSeqno) {
132157
std::vector<std::string> keys;
133158
for (uint64_t i = 0; i < kNumKeys; i++) {

0 commit comments

Comments
 (0)