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

minor fixes for stress/crash contruns (#7006)

Browse Source 
Summary:
Avoid using `cf_consistency` together with `enable_compaction_filter` as
the former heavily uses snapshots while the latter is incompatible with
snapshots.

Also fix a clang-analyze error for a write to a variable that is never
read.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/7006

Reviewed By: zhichao-cao

Differential Revision: D22141679

Pulled By: ajkr

fbshipit-source-id: 1840ae238168818a9ab5973f90fd78c067399447
This commit is contained in:
Andrew Kryczka 2020-06-19 16:03:56 -07:00 committed by Facebook GitHub Bot
parent 88b4210701
commit d76eed4839
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db_stress_tool/db_stress_common.h
View File

@ -485,7 +485,6 @@ inline bool GetFirstIntValInPrefix(std::string big_endian_prefix,
unsigned int pad = sizeof(uint64_t) - (size_key % sizeof(uint64_t)); unsigned int pad = sizeof(uint64_t) - (size_key % sizeof(uint64_t));
if (pad < sizeof(uint64_t)) { if (pad < sizeof(uint64_t)) {
big_endian_prefix.append(pad, '\0'); big_endian_prefix.append(pad, '\0');
size_key += pad;
} }
return GetIntVal(std::move(big_endian_prefix), key_p); return GetIntVal(std::move(big_endian_prefix), key_p);
} }

3
db_stress_tool/db_stress_tool.cc
View File

@ -238,7 +238,8 @@ int db_stress_tool(int argc, char** argv) {
} }
if (FLAGS_enable_compaction_filter && if (FLAGS_enable_compaction_filter &&
(FLAGS_acquire_snapshot_one_in > 0 || FLAGS_compact_range_one_in > 0 || (FLAGS_acquire_snapshot_one_in > 0 || FLAGS_compact_range_one_in > 0 ||
FLAGS_iterpercent > 0 || FLAGS_test_batches_snapshots > 0)) { FLAGS_iterpercent > 0 || FLAGS_test_batches_snapshots ||
FLAGS_test_cf_consistency)) {
fprintf( fprintf(
stderr, stderr,
"Error: acquire_snapshot_one_in, compact_range_one_in, iterpercent, " "Error: acquire_snapshot_one_in, compact_range_one_in, iterpercent, "

3
tools/db_crashtest.py
View File

@ -206,6 +206,9 @@ cf_consistency_params = {
# more frequently # more frequently
"write_buffer_size": 1024 * 1024, "write_buffer_size": 1024 * 1024,
"enable_pipelined_write": lambda: random.randint(0, 1), "enable_pipelined_write": lambda: random.randint(0, 1),
# Snapshots are used heavily in this test mode, while they are incompatible
# with compaction filter.
"enable_compaction_filter": 0,
} }
txn_params = { txn_params = {