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

Avoid overwriting first non-OK Status in db_stress setup (#8907)

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

Reviewed By: zhichao-cao

Differential Revision: D30922081

Pulled By: ajkr

fbshipit-source-id: ad7a32c21d0049342fd20c9b7f555e93674c3671
This commit is contained in:
Andrew Kryczka 2021-09-15 14:23:17 -07:00 committed by Facebook GitHub Bot
parent 7743f033b1
commit 5c92aa38ea
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db_stress_tool/db_stress_test_base.cc
View File

@ -2643,7 +2643,7 @@ void StressTest::Open() {
assert(!s.ok() || column_families_.size() == assert(!s.ok() || column_families_.size() ==
static_cast<size_t>(FLAGS_column_families)); static_cast<size_t>(FLAGS_column_families));
if (FLAGS_test_secondary) { if (s.ok() && FLAGS_test_secondary) {
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
secondaries_.resize(FLAGS_threads); secondaries_.resize(FLAGS_threads);
std::fill(secondaries_.begin(), secondaries_.end(), nullptr); std::fill(secondaries_.begin(), secondaries_.end(), nullptr);
@ -2664,13 +2664,12 @@ void StressTest::Open() {
break; break;
} }
} }
assert(s.ok());
#else #else
fprintf(stderr, "Secondary is not supported in RocksDBLite\n"); fprintf(stderr, "Secondary is not supported in RocksDBLite\n");
exit(1); exit(1);
#endif #endif
} }
if (FLAGS_continuous_verification_interval > 0 && !cmp_db_) { if (s.ok() && FLAGS_continuous_verification_interval > 0 && !cmp_db_) {
Options tmp_opts; Options tmp_opts;
// TODO(yanqin) support max_open_files != -1 for secondary instance. // TODO(yanqin) support max_open_files != -1 for secondary instance.
tmp_opts.max_open_files = -1; tmp_opts.max_open_files = -1;