From 6383e423626932b6ce4642e373a984a052042b8b Mon Sep 17 00:00:00 2001
From: Siying Dong <siying.d@fb.com>
Date: Tue, 20 Mar 2018 18:43:46 -0700
Subject: [PATCH] benchmark.sh to use --max_background_job

Summary: Closes https://github.com/facebook/rocksdb/pull/3632

Differential Revision: D7347012

Pulled By: siying

fbshipit-source-id: 46230ec4a917ccf4c478825b07e92b4665a4820b
---
 tools/benchmark.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/tools/benchmark.sh b/tools/benchmark.sh
index b997b2c111..b7c2eefdb2 100755
--- a/tools/benchmark.sh
+++ b/tools/benchmark.sh
@@ -108,14 +108,12 @@ fi
 
 params_w="$const_params \
           $l0_config \
-          --max_background_compactions=16 \
-          --max_write_buffer_number=8 \
-          --max_background_flushes=7"
+          --max_background_jobs=20 \
+          --max_write_buffer_number=8"
 
 params_bulkload="$const_params \
-                 --max_background_compactions=16 \
+                 --max_background_jobs=20 \
                  --max_write_buffer_number=8 \
-                 --max_background_flushes=7 \
                  --level0_file_num_compaction_trigger=$((10 * M)) \
                  --level0_slowdown_writes_trigger=$((10 * M)) \
                  --level0_stop_writes_trigger=$((10 * M))"
@@ -126,14 +124,14 @@ params_bulkload="$const_params \
 # LSM. In level-based compaction, it means number of L0 files.
 #
 params_level_compact="$const_params \
-                --max_background_flushes=4 \
+                --max_background_jobs=16 \
                 --max_write_buffer_number=4 \
                 --level0_file_num_compaction_trigger=4 \
                 --level0_slowdown_writes_trigger=16 \
                 --level0_stop_writes_trigger=20"
 
 params_univ_compact="$const_params \
-                --max_background_flushes=4 \
+                --max_background_jobs=20 \
                 --max_write_buffer_number=4 \
                 --level0_file_num_compaction_trigger=8 \
                 --level0_slowdown_writes_trigger=16 \
@@ -232,7 +230,7 @@ function run_manual_compaction_worker {
        --subcompactions=$3 \
        --memtablerep=vector \
        --disable_wal=1 \
-       --max_background_compactions=$4 \
+       --max_background_jobs=$4 \
        --seed=$( date +%s ) \
        2>&1 | tee -a $fillrandom_output_file"
 
@@ -276,7 +274,7 @@ function run_univ_compaction {
 
   # Define a set of benchmarks.
   subcompactions=(1 2 4 8 16)
-  max_background_compactions=(16 16 8 4 2)
+  max_background_jobs=(20 20 10 5 4)
 
   i=0
   total=${#subcompactions[@]}
@@ -285,7 +283,7 @@ function run_univ_compaction {
   while [ "$i" -lt "$total" ]
   do
     run_manual_compaction_worker $io_stats $compaction_style ${subcompactions[$i]} \
-      ${max_background_compactions[$i]}
+      ${max_background_jobs[$i]}
     ((i++))
   done
 }