diff --git a/db_stress_tool/db_stress_common.h b/db_stress_tool/db_stress_common.h index 7e57fdd8f785f2b45dbdcea063593728cced7e27..ec3aa212e3cfeaeda7f89aedcf616fb987cbde0c 100644 --- a/db_stress_tool/db_stress_common.h +++ b/db_stress_tool/db_stress_common.h @@ -142,6 +142,7 @@ DECLARE_uint64(periodic_compaction_seconds); DECLARE_uint64(compaction_ttl); DECLARE_bool(allow_concurrent_memtable_write); DECLARE_bool(experimental_allow_mempurge); +DECLARE_string(experimental_mempurge_policy); DECLARE_bool(enable_write_thread_adaptive_yield); DECLARE_int32(reopen); DECLARE_double(bloom_bits); @@ -340,6 +341,18 @@ inline enum ROCKSDB_NAMESPACE::CompressionType StringToCompressionType( return ret_compression_type; } +inline enum ROCKSDB_NAMESPACE::MemPurgePolicy StringToMemPurgePolicy( + const char* mpolicy) { + assert(mpolicy); + if (!strcasecmp(mpolicy, "kAlways")) { + return ROCKSDB_NAMESPACE::MemPurgePolicy::kAlways; + } else if (!strcasecmp(mpolicy, "kAlternate")) { + return ROCKSDB_NAMESPACE::MemPurgePolicy::kAlternate; + } + fprintf(stderr, "Cannot parse mempurge policy: '%s'\n", mpolicy); + return ROCKSDB_NAMESPACE::MemPurgePolicy::kAlternate; +} + inline enum ROCKSDB_NAMESPACE::ChecksumType StringToChecksumType( const char* ctype) { assert(ctype); diff --git a/db_stress_tool/db_stress_gflags.cc b/db_stress_tool/db_stress_gflags.cc index f44f508c66b5d66dafaed271ade29213d14d0a51..f1589d78ca2a4d8c749d3c8bf727894de1a33d45 100644 --- a/db_stress_tool/db_stress_gflags.cc +++ b/db_stress_tool/db_stress_gflags.cc @@ -329,6 +329,9 @@ DEFINE_bool(allow_concurrent_memtable_write, false, DEFINE_bool(experimental_allow_mempurge, false, "Allow mempurge process to collect memtable garbage bytes."); +DEFINE_string(experimental_mempurge_policy, "kAlternate", + "Set mempurge (MemTable Garbage Collection) policy."); + DEFINE_bool(enable_write_thread_adaptive_yield, true, "Use a yielding spin loop for brief writer thread waits."); diff --git a/db_stress_tool/db_stress_test_base.cc b/db_stress_tool/db_stress_test_base.cc index c2dd8b85bc7168097d629e9afb8dd824416926b6..86b240a6472bd948aa133cc60a943b1aad305ba7 100644 --- a/db_stress_tool/db_stress_test_base.cc +++ b/db_stress_tool/db_stress_test_base.cc @@ -2268,6 +2268,8 @@ void StressTest::Open() { options_.allow_concurrent_memtable_write = FLAGS_allow_concurrent_memtable_write; options_.experimental_allow_mempurge = FLAGS_experimental_allow_mempurge; + options_.experimental_mempurge_policy = + StringToMemPurgePolicy(FLAGS_experimental_mempurge_policy.c_str()); options_.periodic_compaction_seconds = FLAGS_periodic_compaction_seconds; options_.ttl = FLAGS_compaction_ttl; options_.enable_pipelined_write = FLAGS_enable_pipelined_write; diff --git a/tools/db_crashtest.py b/tools/db_crashtest.py index 10e5091ac65f4c05b30342360105006ec7cfd0ca..b167fd6dd2be0de62d11e922816a54eb363ee03f 100644 --- a/tools/db_crashtest.py +++ b/tools/db_crashtest.py @@ -220,7 +220,8 @@ whitebox_default_params = { simple_default_params = { "allow_concurrent_memtable_write": lambda: random.randint(0, 1), "column_families": 1, - "experimental_allow_mempurge": 0, + "experimental_allow_mempurge": lambda: random.randint(0, 1), + "experimental_mempurge_policy": lambda: random.choice(["kAlways", "kAlternate"]), "max_background_compactions": 1, "max_bytes_for_level_base": 67108864, "memtablerep": "skip_list",