db_bench: Support control over WBM's allow_stall ctor parameter (#187)

and print the allow_stall parameter to the LOG file
speedb-io · Nov 12, 2023 · 8872380 · 8872380
1 parent 0fa36f9
commit 8872380
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/memtable/write_buffer_manager.cc b/memtable/write_buffer_manager.cc
@@ -220,10 +220,14 @@ std::string WriteBufferManager::GetPrintableOptions() const {
   char buffer[kBufferSize];
 
   // The assumed width of the callers display code
-  int field_width = 47;
+  int field_width = 85;
 
   snprintf(buffer, kBufferSize, "%*s: %" ROCKSDB_PRIszt "\n", field_width,
-           "size", buffer_size());
+           "wbm.size", buffer_size());
+  ret.append(buffer);
+
+  snprintf(buffer, kBufferSize, "%*s: %d\n", field_width, "wbm.allow_stalls",
+           allow_stall_);
   ret.append(buffer);
 
   return ret;

diff --git a/options/db_options.cc b/options/db_options.cc
@@ -851,13 +851,12 @@ void ImmutableDBOptions::Dump(Logger* log) const {
   ROCKS_LOG_HEADER(
       log, "                   Options.db_write_buffer_size: %" ROCKSDB_PRIszt,
       db_write_buffer_size);
-  ROCKS_LOG_HEADER(log, "                   Options.write_buffer_manager: %p",
-                   write_buffer_manager.get());
-  if (write_buffer_manager.get()) {
-    ROCKS_LOG_HEADER(log, "                   write_buffer_manager_options:");
-    ROCKS_LOG_HEADER(log, "%s",
-                     write_buffer_manager->GetPrintableOptions().c_str());
-  }
+  ROCKS_LOG_HEADER(
+      log, "                   Options.write_buffer_manager: %p%s%s",
+      write_buffer_manager.get(), (write_buffer_manager.get() ? "\n" : ""),
+      (write_buffer_manager.get()
+           ? write_buffer_manager->GetPrintableOptions().c_str()
+           : ""));
   ROCKS_LOG_HEADER(log, "        Options.access_hint_on_compaction_start: %d",
                    static_cast<int>(access_hint_on_compaction_start));
   ROCKS_LOG_HEADER(

diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc
@@ -529,6 +529,8 @@ DEFINE_int64(db_write_buffer_size,
 DEFINE_bool(cost_write_buffer_to_cache, false,
             "The usage of memtable is costed to the block cache");
 
+DEFINE_bool(allow_wbm_stalls, false, "Enable WBM write stalls and delays");
+
 DEFINE_int64(arena_block_size, ROCKSDB_NAMESPACE::Options().arena_block_size,
              "The size, in bytes, of one block in arena memory allocation.");
 
@@ -4306,9 +4308,12 @@ class Benchmark {
         FLAGS_compression_use_zstd_dict_trainer;
 
     options.max_open_files = FLAGS_open_files;
+    if ((FLAGS_db_write_buffer_size == 0) && FLAGS_allow_wbm_stalls) {
+      ErrorExit("-allow_wbm_stalls is useless if db_write_buffer_size == 0");
+    }
     if (FLAGS_cost_write_buffer_to_cache || FLAGS_db_write_buffer_size != 0) {
-      options.write_buffer_manager.reset(
-          new WriteBufferManager(FLAGS_db_write_buffer_size, cache_));
+      options.write_buffer_manager.reset(new WriteBufferManager(
+          FLAGS_db_write_buffer_size, cache_, FLAGS_allow_wbm_stalls));
     }
     options.arena_block_size = FLAGS_arena_block_size;
     options.write_buffer_size = FLAGS_write_buffer_size;