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

Add status check enforcement for column_family_test.cc (#7484)

Browse Source 
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/7484

Reviewed By: jay-zhuang

Differential Revision: D24037616

Pulled By: akankshamahajan15

fbshipit-source-id: 0f63281f81046bcb1b95a7578783285cc6346ece
This commit is contained in:
Akanksha Mahajan 2020-10-02 13:33:50 -07:00 committed by Facebook GitHub Bot
parent 48d5aa9bab
commit 7cd760dfdf
5 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -655,6 +655,7 @@ ifdef ASSERT_STATUS_CHECKED
block_fetcher_test \ block_fetcher_test \
full_filter_block_test \ full_filter_block_test \
partitioned_filter_block_test \ partitioned_filter_block_test \
column_family_test \
ifeq ($(USE_FOLLY_DISTRIBUTED_MUTEX),1) ifeq ($(USE_FOLLY_DISTRIBUTED_MUTEX),1)
TESTS_PASSING_ASC += folly_synchronization_distributed_mutex_test TESTS_PASSING_ASC += folly_synchronization_distributed_mutex_test

64
db/column_family_test.cc
View File

@ -79,7 +79,12 @@ class ColumnFamilyTestBase : public testing::Test {
std::vector<ColumnFamilyDescriptor> column_families; std::vector<ColumnFamilyDescriptor> column_families;
for (auto h : handles_) { for (auto h : handles_) {
ColumnFamilyDescriptor cfdescriptor; ColumnFamilyDescriptor cfdescriptor;
h->GetDescriptor(&cfdescriptor); Status s = h->GetDescriptor(&cfdescriptor);
#ifdef ROCKSDB_LITE
EXPECT_TRUE(s.IsNotSupported());
#else
EXPECT_OK(s);
#endif // ROCKSDB_LITE
column_families.push_back(cfdescriptor); column_families.push_back(cfdescriptor);
} }
Close(); Close();
@ -168,7 +173,7 @@ class ColumnFamilyTestBase : public testing::Test {
void Close() { void Close() {
for (auto h : handles_) { for (auto h : handles_) {
if (h) { if (h) {
db_->DestroyColumnFamilyHandle(h); ASSERT_OK(db_->DestroyColumnFamilyHandle(h));
} }
} }
handles_.clear(); handles_.clear();
@ -279,9 +284,11 @@ class ColumnFamilyTestBase : public testing::Test {
// Verify the CF options of the returned CF handle. // Verify the CF options of the returned CF handle.
ColumnFamilyDescriptor desc; ColumnFamilyDescriptor desc;
ASSERT_OK(handles_[cfi]->GetDescriptor(&desc)); ASSERT_OK(handles_[cfi]->GetDescriptor(&desc));
RocksDBOptionsParser::VerifyCFOptions(ConfigOptions(), desc.options, // Need to sanitize the default column family options before comparing
current_cf_opt); // them.
ASSERT_OK(RocksDBOptionsParser::VerifyCFOptions(
ConfigOptions(), desc.options,
SanitizeOptions(dbfull()->immutable_db_options(), current_cf_opt)));
#endif // !ROCKSDB_LITE #endif // !ROCKSDB_LITE
cfi++; cfi++;
} }
@ -307,7 +314,7 @@ class ColumnFamilyTestBase : public testing::Test {
void DropColumnFamilies(const std::vector<int>& cfs) { void DropColumnFamilies(const std::vector<int>& cfs) {
for (auto cf : cfs) { for (auto cf : cfs) {
ASSERT_OK(db_->DropColumnFamily(handles_[cf])); ASSERT_OK(db_->DropColumnFamily(handles_[cf]));
db_->DestroyColumnFamilyHandle(handles_[cf]); ASSERT_OK(db_->DestroyColumnFamilyHandle(handles_[cf]));
handles_[cf] = nullptr; handles_[cf] = nullptr;
names_[cf] = ""; names_[cf] = "";
} }
@ -328,7 +335,7 @@ class ColumnFamilyTestBase : public testing::Test {
ASSERT_OK(Put(cf, key, rnd_.RandomString(key_value_size - 10))); ASSERT_OK(Put(cf, key, rnd_.RandomString(key_value_size - 10)));
} }
} }
db_->FlushWAL(false); ASSERT_OK(db_->FlushWAL(/*sync=*/false));
} }
#ifndef ROCKSDB_LITE // TEST functions in DB are not supported in lite #ifndef ROCKSDB_LITE // TEST functions in DB are not supported in lite
@ -650,7 +657,7 @@ TEST_P(FlushEmptyCFTestWithParam, FlushEmptyCFTest) {
Flush(0); Flush(0);
ASSERT_OK(Put(1, "bar", "v3")); // seqID 4 ASSERT_OK(Put(1, "bar", "v3")); // seqID 4
ASSERT_OK(Put(1, "foo", "v4")); // seqID 5 ASSERT_OK(Put(1, "foo", "v4")); // seqID 5
db_->FlushWAL(false); ASSERT_OK(db_->FlushWAL(/*sync=*/false));
// Preserve file system state up to here to simulate a crash condition. // Preserve file system state up to here to simulate a crash condition.
fault_env->SetFilesystemActive(false); fault_env->SetFilesystemActive(false);
@ -713,7 +720,7 @@ TEST_P(FlushEmptyCFTestWithParam, FlushEmptyCFTest2) {
// Write to log file D // Write to log file D
ASSERT_OK(Put(1, "bar", "v4")); // seqID 7 ASSERT_OK(Put(1, "bar", "v4")); // seqID 7
ASSERT_OK(Put(1, "bar", "v5")); // seqID 8 ASSERT_OK(Put(1, "bar", "v5")); // seqID 8
db_->FlushWAL(false); ASSERT_OK(db_->FlushWAL(/*sync=*/false));
// Preserve file system state up to here to simulate a crash condition. // Preserve file system state up to here to simulate a crash condition.
fault_env->SetFilesystemActive(false); fault_env->SetFilesystemActive(false);
std::vector<std::string> names; std::vector<std::string> names;
@ -842,13 +849,15 @@ TEST_P(ColumnFamilyTest, WriteBatchFailure) {
Open(); Open();
CreateColumnFamiliesAndReopen({"one", "two"}); CreateColumnFamiliesAndReopen({"one", "two"});
WriteBatch batch; WriteBatch batch;
batch.Put(handles_[0], Slice("existing"), Slice("column-family")); ASSERT_OK(batch.Put(handles_[0], Slice("existing"), Slice("column-family")));
batch.Put(handles_[1], Slice("non-existing"), Slice("column-family")); ASSERT_OK(
batch.Put(handles_[1], Slice("non-existing"), Slice("column-family")));
ASSERT_OK(db_->Write(WriteOptions(), &batch)); ASSERT_OK(db_->Write(WriteOptions(), &batch));
DropColumnFamilies({1}); DropColumnFamilies({1});
WriteOptions woptions_ignore_missing_cf; WriteOptions woptions_ignore_missing_cf;
woptions_ignore_missing_cf.ignore_missing_column_families = true; woptions_ignore_missing_cf.ignore_missing_column_families = true;
batch.Put(handles_[0], Slice("still here"), Slice("column-family")); ASSERT_OK(
batch.Put(handles_[0], Slice("still here"), Slice("column-family")));
ASSERT_OK(db_->Write(woptions_ignore_missing_cf, &batch)); ASSERT_OK(db_->Write(woptions_ignore_missing_cf, &batch));
ASSERT_EQ("column-family", Get(0, "still here")); ASSERT_EQ("column-family", Get(0, "still here"));
Status s = db_->Write(WriteOptions(), &batch); Status s = db_->Write(WriteOptions(), &batch);
@ -887,10 +896,10 @@ TEST_P(ColumnFamilyTest, IgnoreRecoveredLog) {
ASSERT_OK(env_->CreateDirIfMissing(dbname_)); ASSERT_OK(env_->CreateDirIfMissing(dbname_));
ASSERT_OK(env_->CreateDirIfMissing(backup_logs)); ASSERT_OK(env_->CreateDirIfMissing(backup_logs));
std::vector<std::string> old_files; std::vector<std::string> old_files;
env_->GetChildren(backup_logs, &old_files); ASSERT_OK(env_->GetChildren(backup_logs, &old_files));
for (auto& file : old_files) { for (auto& file : old_files) {
if (file != "." && file != "..") { if (file != "." && file != "..") {
env_->DeleteFile(backup_logs + "/" + file); ASSERT_OK(env_->DeleteFile(backup_logs + "/" + file));
} }
} }
@ -918,7 +927,7 @@ TEST_P(ColumnFamilyTest, IgnoreRecoveredLog) {
// copy the logs to backup // copy the logs to backup
std::vector<std::string> logs; std::vector<std::string> logs;
env_->GetChildren(db_options_.wal_dir, &logs); ASSERT_OK(env_->GetChildren(db_options_.wal_dir, &logs));
for (auto& log : logs) { for (auto& log : logs) {
if (log != ".." && log != ".") { if (log != ".." && log != ".") {
CopyFile(db_options_.wal_dir + "/" + log, backup_logs + "/" + log); CopyFile(db_options_.wal_dir + "/" + log, backup_logs + "/" + log);
@ -983,6 +992,7 @@ TEST_P(ColumnFamilyTest, FlushTest) {
ASSERT_OK(Put(0, "foofoo", "bar")); ASSERT_OK(Put(0, "foofoo", "bar"));
for (auto* it : iterators) { for (auto* it : iterators) {
ASSERT_OK(it->status());
delete it; delete it;
} }
} }
@ -1080,8 +1090,8 @@ TEST_P(ColumnFamilyTest, CrashAfterFlush) {
CreateColumnFamilies({"one"}); CreateColumnFamilies({"one"});
WriteBatch batch; WriteBatch batch;
batch.Put(handles_[0], Slice("foo"), Slice("bar")); ASSERT_OK(batch.Put(handles_[0], Slice("foo"), Slice("bar")));
batch.Put(handles_[1], Slice("foo"), Slice("bar")); ASSERT_OK(batch.Put(handles_[1], Slice("foo"), Slice("bar")));
ASSERT_OK(db_->Write(WriteOptions(), &batch)); ASSERT_OK(db_->Write(WriteOptions(), &batch));
Flush(0); Flush(0);
fault_env->SetFilesystemActive(false); fault_env->SetFilesystemActive(false);
@ -2067,6 +2077,7 @@ std::string IterStatus(Iterator* iter) {
if (iter->Valid()) { if (iter->Valid()) {
result = iter->key().ToString() + "->" + iter->value().ToString(); result = iter->key().ToString() + "->" + iter->value().ToString();
} else { } else {
EXPECT_OK(iter->status());
result = "(invalid)"; result = "(invalid)";
} }
return result; return result;
@ -2321,7 +2332,7 @@ TEST_P(ColumnFamilyTest, ReadDroppedColumnFamily) {
ASSERT_OK(db_->DropColumnFamily(handles_[2])); ASSERT_OK(db_->DropColumnFamily(handles_[2]));
} else { } else {
// delete CF two // delete CF two
db_->DestroyColumnFamilyHandle(handles_[2]); ASSERT_OK(db_->DestroyColumnFamilyHandle(handles_[2]));
handles_[2] = nullptr; handles_[2] = nullptr;
} }
// Make sure iterator created can still be used. // Make sure iterator created can still be used.
@ -2377,7 +2388,6 @@ TEST_P(ColumnFamilyTest, LiveIteratorWithDroppedColumnFamily) {
// 1MB should create ~10 files for each CF // 1MB should create ~10 files for each CF
int kKeysNum = 10000; int kKeysNum = 10000;
PutRandomData(1, kKeysNum, 100); PutRandomData(1, kKeysNum, 100);
{ {
std::unique_ptr<Iterator> iterator( std::unique_ptr<Iterator> iterator(
db_->NewIterator(ReadOptions(), handles_[1])); db_->NewIterator(ReadOptions(), handles_[1]));
@ -3028,6 +3038,7 @@ TEST_P(ColumnFamilyTest, IteratorCloseWALFile1) {
ASSERT_OK(Put(1, "fodor", "mirko")); ASSERT_OK(Put(1, "fodor", "mirko"));
// Create an iterator holding the current super version. // Create an iterator holding the current super version.
Iterator* it = db_->NewIterator(ReadOptions(), handles_[1]); Iterator* it = db_->NewIterator(ReadOptions(), handles_[1]);
ASSERT_OK(it->status());
// A flush will make `it` hold the last reference of its super version. // A flush will make `it` hold the last reference of its super version.
Flush(1); Flush(1);
@ -3080,6 +3091,7 @@ TEST_P(ColumnFamilyTest, IteratorCloseWALFile2) {
ReadOptions ro; ReadOptions ro;
ro.background_purge_on_iterator_cleanup = true; ro.background_purge_on_iterator_cleanup = true;
Iterator* it = db_->NewIterator(ro, handles_[1]); Iterator* it = db_->NewIterator(ro, handles_[1]);
ASSERT_OK(it->status());
// A flush will make `it` hold the last reference of its super version. // A flush will make `it` hold the last reference of its super version.
Flush(1); Flush(1);
@ -3174,6 +3186,8 @@ TEST_P(ColumnFamilyTest, ForwardIteratorCloseWALFile) {
// Deleting the iterator will clear its super version, triggering // Deleting the iterator will clear its super version, triggering
// closing all files // closing all files
it->Seek(""); it->Seek("");
ASSERT_OK(it->status());
ASSERT_EQ(2, env.num_open_wal_file_.load()); ASSERT_EQ(2, env.num_open_wal_file_.load());
ASSERT_EQ(0, env.delete_count_.load()); ASSERT_EQ(0, env.delete_count_.load());
@ -3204,8 +3218,8 @@ TEST_P(ColumnFamilyTest, LogSyncConflictFlush) {
Open(); Open();
CreateColumnFamiliesAndReopen({"one", "two"}); CreateColumnFamiliesAndReopen({"one", "two"});
Put(0, "", ""); ASSERT_OK(Put(0, "", ""));
Put(1, "foo", "bar"); ASSERT_OK(Put(1, "foo", "bar"));
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency( ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
{{"DBImpl::SyncWAL:BeforeMarkLogsSynced:1", {{"DBImpl::SyncWAL:BeforeMarkLogsSynced:1",
@ -3215,11 +3229,11 @@ TEST_P(ColumnFamilyTest, LogSyncConflictFlush) {
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing(); ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
ROCKSDB_NAMESPACE::port::Thread thread([&] { db_->SyncWAL(); }); ROCKSDB_NAMESPACE::port::Thread thread([&] { ASSERT_OK(db_->SyncWAL()); });
TEST_SYNC_POINT("ColumnFamilyTest::LogSyncConflictFlush:1"); TEST_SYNC_POINT("ColumnFamilyTest::LogSyncConflictFlush:1");
Flush(1); Flush(1);
Put(1, "foo", "bar"); ASSERT_OK(Put(1, "foo", "bar"));
Flush(1); Flush(1);
TEST_SYNC_POINT("ColumnFamilyTest::LogSyncConflictFlush:2"); TEST_SYNC_POINT("ColumnFamilyTest::LogSyncConflictFlush:2");
@ -3302,7 +3316,7 @@ TEST_P(ColumnFamilyTest, DISABLED_LogTruncationTest) {
Close(); Close();
// cleanup // cleanup
env_->DeleteDir(backup_logs); ASSERT_OK(env_->DeleteDir(backup_logs));
} }
TEST_P(ColumnFamilyTest, DefaultCfPathsTest) { TEST_P(ColumnFamilyTest, DefaultCfPathsTest) {
@ -3364,9 +3378,11 @@ TEST_P(ColumnFamilyTest, MultipleCFPathsTest) {
read_options.readahead_size = 0; read_options.readahead_size = 0;
auto it = dbi->NewIterator(read_options, handles_[cf]); auto it = dbi->NewIterator(read_options, handles_[cf]);
for (it->SeekToFirst(); it->Valid(); it->Next()) { for (it->SeekToFirst(); it->Valid(); it->Next()) {
ASSERT_OK(it->status());
Slice key(it->key()); Slice key(it->key());
ASSERT_NE(keys_[cf].end(), keys_[cf].find(key.ToString())); ASSERT_NE(keys_[cf].end(), keys_[cf].find(key.ToString()));
} }
ASSERT_OK(it->status());
delete it; delete it;
for (const auto& key : keys_[cf]) { for (const auto& key : keys_[cf]) {

8
db/db_impl/db_impl_write.cc
View File

@ -863,7 +863,9 @@ void DBImpl::IOStatusCheck(const IOStatus& io_status) {
!io_status.IsBusy() && !io_status.IsIncomplete()) || !io_status.IsBusy() && !io_status.IsIncomplete()) ||
io_status.IsIOFenced()) { io_status.IsIOFenced()) {
mutex_.Lock(); mutex_.Lock();
error_handler_.SetBGError(io_status, BackgroundErrorReason::kWriteCallback); // May be change the return status to void?
error_handler_.SetBGError(io_status, BackgroundErrorReason::kWriteCallback)
.PermitUncheckedError();
mutex_.Unlock(); mutex_.Unlock();
} }
} }
@ -877,7 +879,9 @@ void DBImpl::MemTableInsertStatusCheck(const Status& status) {
if (!status.ok()) { if (!status.ok()) {
mutex_.Lock(); mutex_.Lock();
assert(!error_handler_.IsBGWorkStopped()); assert(!error_handler_.IsBGWorkStopped());
error_handler_.SetBGError(status, BackgroundErrorReason::kMemTable); // May be change the return status to void?
error_handler_.SetBGError(status, BackgroundErrorReason::kMemTable)
.PermitUncheckedError();
mutex_.Unlock(); mutex_.Unlock();
} }
} }

2
db/db_test_util.cc
View File

@ -1211,7 +1211,7 @@ std::string DBTestBase::DumpSSTableList() {
void DBTestBase::GetSstFiles(Env* env, std::string path, void DBTestBase::GetSstFiles(Env* env, std::string path,
std::vector<std::string>* files) { std::vector<std::string>* files) {
env->GetChildren(path, files); EXPECT_OK(env->GetChildren(path, files));
files->erase( files->erase(
std::remove_if(files->begin(), files->end(), [](std::string name) { std::remove_if(files->begin(), files->end(), [](std::string name) {

14
db/forward_iterator.cc
View File

@ -661,8 +661,11 @@ void ForwardIterator::RebuildIterators(bool refresh_sv) {
sv_->mem->NewRangeTombstoneIterator( sv_->mem->NewRangeTombstoneIterator(
read_options_, sv_->current->version_set()->LastSequence())); read_options_, sv_->current->version_set()->LastSequence()));
range_del_agg.AddTombstones(std::move(range_del_iter)); range_del_agg.AddTombstones(std::move(range_del_iter));
sv_->imm->AddRangeTombstoneIterators(read_options_, &arena_, // Always return Status::OK().
&range_del_agg); assert(
sv_->imm
->AddRangeTombstoneIterators(read_options_, &arena_, &range_del_agg)
.ok());
} }
has_iter_trimmed_for_upper_bound_ = false; has_iter_trimmed_for_upper_bound_ = false;
@ -724,8 +727,11 @@ void ForwardIterator::RenewIterators() {
svnew->mem->NewRangeTombstoneIterator( svnew->mem->NewRangeTombstoneIterator(
read_options_, sv_->current->version_set()->LastSequence())); read_options_, sv_->current->version_set()->LastSequence()));
range_del_agg.AddTombstones(std::move(range_del_iter)); range_del_agg.AddTombstones(std::move(range_del_iter));
svnew->imm->AddRangeTombstoneIterators(read_options_, &arena_, // Always return Status::OK().
&range_del_agg); assert(
svnew->imm
->AddRangeTombstoneIterators(read_options_, &arena_, &range_del_agg)
.ok());
} }
const auto* vstorage = sv_->current->storage_info(); const auto* vstorage = sv_->current->storage_info();