Run manual compaction in stress/crash tests (#3936)

Summary:
- Add support to `db_stress` for `CompactRange`
- Enable `CompactRange` and `CompactFiles` in crash tests
Closes https://github.com/facebook/rocksdb/pull/3936

Differential Revision: D8230953

Pulled By: ajkr

fbshipit-source-id: 208f9980b5bc8c204b1fa726e83791ad674e21e8
main
Andrew Kryczka 7 years ago committed by Facebook Github Bot
parent dd216dd76a
commit 7497f992e0
  1. 2
      tools/db_crashtest.py
  2. 33
      tools/db_stress.cc

@ -25,6 +25,8 @@ default_params = {
"block_size": 16384, "block_size": 16384,
"cache_size": 1048576, "cache_size": 1048576,
"clear_column_family_one_in": 0, "clear_column_family_one_in": 0,
"compact_files_one_in": 1000000,
"compact_range_one_in": 1000000,
"delpercent": 5, "delpercent": 5,
"destroy_db_initially": 0, "destroy_db_initially": 0,
"expected_values_path": expected_values_file.name, "expected_values_path": expected_values_file.name,

@ -382,10 +382,16 @@ DEFINE_bool(use_txn, false,
"Use TransactionDB. Currently the default write policy is " "Use TransactionDB. Currently the default write policy is "
"TxnDBWritePolicy::WRITE_PREPARED"); "TxnDBWritePolicy::WRITE_PREPARED");
// Temporarily disable this to allows it to detect new bugs
DEFINE_int32(compact_files_one_in, 0, DEFINE_int32(compact_files_one_in, 0,
"If non-zero, then CompactFiles() will be called one for every N " "If non-zero, then CompactFiles() will be called once for every N "
"operations IN AVERAGE. 0 indicates CompactFiles() is disabled."); "operations on average. 0 indicates CompactFiles() is disabled.");
DEFINE_int32(compact_range_one_in, 0,
"If non-zero, then CompactRange() will be called once for every N "
"operations on average. 0 indicates CompactRange() is disabled.");
DEFINE_int32(compact_range_width, 10000,
"The width of the ranges passed to CompactRange().");
DEFINE_int32(acquire_snapshot_one_in, 0, DEFINE_int32(acquire_snapshot_one_in, 0,
"If non-zero, then acquires a snapshot once every N operations on " "If non-zero, then acquires a snapshot once every N operations on "
@ -1813,6 +1819,27 @@ class StressTest {
auto column_family = column_families_[rand_column_family]; auto column_family = column_families_[rand_column_family];
if (FLAGS_compact_range_one_in > 0 &&
thread->rand.Uniform(FLAGS_compact_range_one_in) == 0) {
int64_t end_key_num;
if (port::kMaxInt64 - rand_key < FLAGS_compact_range_width) {
end_key_num = port::kMaxInt64;
} else {
end_key_num = FLAGS_compact_range_width + rand_key;
}
std::string end_key_buf = Key(end_key_num);
Slice end_key(end_key_buf);
CompactRangeOptions cro;
cro.exclusive_manual_compaction =
static_cast<bool>(thread->rand.Next() % 2);
Status status = db_->CompactRange(cro, column_family, &key, &end_key);
if (!status.ok()) {
printf("Unable to perform CompactRange(): %s\n",
status.ToString().c_str());
}
}
if (FLAGS_acquire_snapshot_one_in > 0 && if (FLAGS_acquire_snapshot_one_in > 0 &&
thread->rand.Uniform(FLAGS_acquire_snapshot_one_in) == 0) { thread->rand.Uniform(FLAGS_acquire_snapshot_one_in) == 0) {
auto snapshot = db_->GetSnapshot(); auto snapshot = db_->GetSnapshot();

Loading…
Cancel
Save