From 4eedd164029978901798bfd17ae8978bedb80550 Mon Sep 17 00:00:00 2001 From: Alison Felizzi Date: Thu, 11 Nov 2021 04:16:48 +0000 Subject: Import wiredtiger: 80da27f0be1d06ca9c6a9891d5a5cf54bf188cbd from branch mongodb-master ref: 826862344b..80da27f0be for: 5.2.0 WT-8358 Pass ops and args fields to wtperf via command line --- .../wtperf/runners/evict-btree-stress-multi.json | 6 --- .../bench/wtperf/runners/evict-fairness.json | 6 --- .../wiredtiger/bench/wtperf/runners/log.json | 6 --- .../bench/wtperf/runners/log_many_threads.json | 6 --- .../bench/wtperf/runners/log_no_checkpoints.json | 6 --- .../bench/wtperf/runners/log_no_prealloc.json | 6 --- .../bench/wtperf/runners/log_small_files.json | 6 --- .../bench/wtperf/runners/log_zero_fill.json | 6 --- .../bench/wtperf/runners/update-stress.json | 6 --- .../bench/wtperf/wtperf_run_py/perf_stat.py | 26 ++++----- .../bench/wtperf/wtperf_run_py/wtperf_config.py | 12 +++-- .../bench/wtperf/wtperf_run_py/wtperf_run.py | 63 +++++++++++++--------- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/test/evergreen.yml | 56 +++++++++++++------ 14 files changed, 98 insertions(+), 115 deletions(-) delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-stress-multi.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/evict-fairness.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/log.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/log_many_threads.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/log_no_checkpoints.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/log_no_prealloc.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/log_small_files.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/log_zero_fill.json delete mode 100644 src/third_party/wiredtiger/bench/wtperf/runners/update-stress.json (limited to 'src/third_party') diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-stress-multi.json b/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-stress-multi.json deleted file mode 100644 index 586b7a2e396..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-stress-multi.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": null, - "operations": ["warnings", "max_latencies"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/evict-fairness.json b/src/third_party/wiredtiger/bench/wtperf/runners/evict-fairness.json deleted file mode 100644 index 68b96f67d4c..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/evict-fairness.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": ["-C statistics_log=(wait=10000,on_close=true,json=false,sources=[file:])", "-o reopen_connection=false"], - "operations": ["eviction_page_seen"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/log.json b/src/third_party/wiredtiger/bench/wtperf/runners/log.json deleted file mode 100644 index a5a8dfbfb68..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/log.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": [], - "operations": ["update", "max_update_throughput", "min_update_throughput"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/log_many_threads.json b/src/third_party/wiredtiger/bench/wtperf/runners/log_many_threads.json deleted file mode 100644 index 1e6a7c306a5..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/log_many_threads.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": ["-C log=(enabled,file_max=1M),session_max=256", "-o threads=((count=128,updates=1))"], - "operations": ["update"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/log_no_checkpoints.json b/src/third_party/wiredtiger/bench/wtperf/runners/log_no_checkpoints.json deleted file mode 100644 index 6a222334933..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/log_no_checkpoints.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": ["-C checkpoint=(wait=0)"], - "operations": ["update"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/log_no_prealloc.json b/src/third_party/wiredtiger/bench/wtperf/runners/log_no_prealloc.json deleted file mode 100644 index f04bf5795fe..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/log_no_prealloc.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": ["-C log=(enabled,file_max=1M,prealloc=false)"], - "operations": ["update"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/log_small_files.json b/src/third_party/wiredtiger/bench/wtperf/runners/log_small_files.json deleted file mode 100644 index d10d7062fd7..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/log_small_files.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": ["-C log=(enabled,file_max=1M)"], - "operations": ["update"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/log_zero_fill.json b/src/third_party/wiredtiger/bench/wtperf/runners/log_zero_fill.json deleted file mode 100644 index 1ed08b5441d..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/log_zero_fill.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": ["-C log=(enabled,file_max=1M,zero_fill=true)"], - "operations": ["update"] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/update-stress.json b/src/third_party/wiredtiger/bench/wtperf/runners/update-stress.json deleted file mode 100644 index b28921b89e2..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/update-stress.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "arguments": null, - "operations": [ "update" ] - } -] diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/perf_stat.py b/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/perf_stat.py index 51787e75f9d..53e5f5af034 100644 --- a/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/perf_stat.py +++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/perf_stat.py @@ -27,8 +27,9 @@ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -import glob, re, os +import glob import json +import re class PerfStat: @@ -117,23 +118,18 @@ class PerfStatCount(PerfStat): class PerfStatLatency(PerfStat): - def __init__(self, - short_label: str, - stat_file:str, - output_label: str, - num_max: int): - super().__init__(short_label=short_label, - stat_file=stat_file, - output_label=output_label) - self.num_max = num_max + def __init__(self, short_label: str, stat_file: str, output_label: str, num_max: int): + super().__init__(short_label=short_label, + stat_file=stat_file, + output_label=output_label) + self.num_max = num_max def find_stat(self, test_stat_path: str): values = [] - if os.path.isfile(test_stat_path): - for line in open(test_stat_path): - as_dict = json.loads(line) - values.append(as_dict["wtperf"]["read"]["max latency"]) - values.append(as_dict["wtperf"]["update"]["max latency"]) + for line in open(test_stat_path): + as_dict = json.loads(line) + values.append(as_dict["wtperf"]["read"]["max latency"]) + values.append(as_dict["wtperf"]["update"]["max latency"]) return values def get_value(self, nth_max: int): diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_config.py b/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_config.py index a440b36449f..5f6861a0d5d 100644 --- a/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_config.py +++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_config.py @@ -33,7 +33,9 @@ class WTPerfConfig: wtperf_path: str, home_dir: str, test: str, - arg_file: str = None, + batch_file: str = None, + arguments=None, + operations=None, environment: str = None, run_max: int = 1, verbose: bool = False, @@ -44,7 +46,9 @@ class WTPerfConfig: self.wtperf_path: str = wtperf_path self.home_dir: str = home_dir self.test: str = test - self.arg_file = arg_file + self.batch_file = batch_file + self.arguments = arguments + self.operations = operations self.environment: str = environment self.run_max: int = run_max self.verbose: bool = verbose @@ -54,7 +58,9 @@ class WTPerfConfig: def to_value_dict(self): as_dict = {'wt_perf_path': self.wtperf_path, 'test': self.test, - 'arg_file': self.arg_file, + 'batch_file': self.batch_file, + 'arguments': self.arguments, + 'operations': self.operations, 'home_dir': self.home_dir, 'environment': self.environment, 'run_max': self.run_max, diff --git a/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_run.py b/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_run.py index 0ae18756b53..6683f92d18c 100644 --- a/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_run.py +++ b/src/third_party/wiredtiger/bench/wtperf/wtperf_run_py/wtperf_run.py @@ -140,7 +140,8 @@ def run_test(config: WTPerfConfig, test_run: int, operations: List[str] = None, test=config.test, home=test_home) try: - subprocess.run(command_line, check=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, universal_newlines=True) + subprocess.run(command_line, check=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, + universal_newlines=True) except subprocess.CalledProcessError as cpe: print("Error: {}".format(cpe.output)) exit(1) @@ -219,7 +220,9 @@ def main(): help='reuse and reanalyse results from previous tests rather than running tests again') parser.add_argument('-g', '--git_root', help='path of the Git working directory') parser.add_argument('-i', '--json_info', help='additional test information in a json format string') - parser.add_argument('-a', '--arg_file', help='additional wtperf arguments in a json format file') + parser.add_argument('-bf', '--batch_file', help='Run all specified configurations for a single test') + parser.add_argument('-args', '--arguments', help='Additional arguments to pass into wtperf') + parser.add_argument('-ops', '--operations', help='List of operations to report metrics for') parser.add_argument('-v', '--verbose', action="store_true", help='be verbose') args = parser.parse_args() @@ -227,17 +230,19 @@ def main(): print('WTPerfPy') print('========') print("Configuration:") - print(" WtPerf path: {}".format(args.wtperf)) - print(" Environment: {}".format(args.env)) - print(" Test path: {}".format(args.test)) - print(" Home base: {}".format(args.home)) - print(" Addition arguments(file): {}".format(args.arg_file)) - print(" Git root: {}".format(args.git_root)) - print(" Outfile: {}".format(args.outfile)) - print(" Runmax: {}".format(args.runmax)) - print(" JSON info {}".format(args.json_info)) - print(" Reuse results: {}".format(args.reuse)) - print(" Brief output: {}".format(args.brief_output)) + print(" WtPerf path: {}".format(args.wtperf)) + print(" Environment: {}".format(args.env)) + print(" Test path: {}".format(args.test)) + print(" Home base: {}".format(args.home)) + print(" Batch file: {}".format(args.batch_file)) + print(" Arguments: {}".format(args.arguments)) + print(" Operations: {}".format(args.operations)) + print(" Git root: {}".format(args.git_root)) + print(" Outfile: {}".format(args.outfile)) + print(" Runmax: {}".format(args.runmax)) + print(" JSON info {}".format(args.json_info)) + print(" Reuse results: {}".format(args.reuse)) + print(" Brief output: {}".format(args.brief_output)) if args.wtperf is None: sys.exit('The path to the wtperf executable is required') @@ -245,15 +250,21 @@ def main(): sys.exit('The path to the test file is required') if args.home is None: sys.exit('The path to the "home" directory is required') - if args.arg_file and not os.path.isfile(args.arg_file): - sys.exit("arg_file: {} not found!".format(args.arg_file)) + if args.batch_file and not os.path.isfile(args.batch_file): + sys.exit("batch_file: {} not found!".format(args.batch_file)) + if args.batch_file and (args.arguments or args.operations): + sys.exit("A batch file (-bf) should not be defined at the same time as -ops or -args") json_info = json.loads(args.json_info) if args.json_info else {} + arguments = json.loads(args.arguments) if args.arguments else None + operations = json.loads(args.operations) if args.operations else None config = WTPerfConfig(wtperf_path=args.wtperf, home_dir=args.home, test=args.test, - arg_file=args.arg_file, + batch_file=args.batch_file, + arguments=arguments, + operations=operations, environment=args.env, run_max=args.runmax, verbose=args.verbose, @@ -262,32 +273,32 @@ def main(): perf_stats: PerfStatCollection = setup_perf_stats() - if config.arg_file: + if config.batch_file: if args.verbose: - print("Reading arguments file {}".format(config.arg_file)) - with open(config.arg_file, "r") as file: - arg_file_contents = json.load(file) + print("Reading batch file {}".format(config.batch_file)) + with open(config.batch_file, "r") as file: + batch_file_contents = json.load(file) # Run test if not args.reuse: - if config.arg_file: - for content in arg_file_contents: + if config.batch_file: + for content in batch_file_contents: if args.verbose: print("Argument: {}, Operation: {}".format(content["arguments"], content["operations"])) run_test_wrapper(config=config, operations=content["operations"], arguments=content["arguments"]) else: - run_test_wrapper(config=config) + run_test_wrapper(config=config, arguments=arguments, operations=operations) if not args.verbose and not args.outfile: sys.exit("Enable verbosity (or provide a file path) to dump the stats. " "Try 'python3 wtperf_run.py --help' for more information.") # Process result - if config.arg_file: - for content in arg_file_contents: + if config.batch_file: + for content in batch_file_contents: process_results(config, perf_stats, operations=content["operations"]) else: - process_results(config, perf_stats) + process_results(config, perf_stats, operations=operations) # Output result if args.brief_output: diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index d069ac550a0..a813d958f3b 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "826862344b92c27c693faaee60209171b4aa68d9" + "commit": "80da27f0be1d06ca9c6a9891d5a5cf54bf188cbd" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index 597e79f716b..2f6dc4b0253 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -2966,6 +2966,7 @@ tasks: vars: perf-test-name: small-lsm maxruns: 3 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: small-lsm @@ -2980,6 +2981,7 @@ tasks: vars: perf-test-name: medium-lsm maxruns: 1 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: medium-lsm @@ -2994,6 +2996,7 @@ tasks: vars: perf-test-name: medium-lsm-compact maxruns: 1 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: medium-lsm-compact @@ -3008,6 +3011,7 @@ tasks: vars: perf-test-name: medium-multi-lsm maxruns: 1 + wtarg: -ops ['"load", "read", "update"'] - func: "upload-perf-test-stats" vars: perf-test-name: medium-multi-lsm @@ -3022,6 +3026,7 @@ tasks: vars: perf-test-name: parallel-pop-lsm maxruns: 1 + wtarg: -ops ['"load"'] - func: "upload-perf-test-stats" vars: perf-test-name: parallel-pop-lsm @@ -3036,6 +3041,7 @@ tasks: vars: perf-test-name: update-lsm maxruns: 1 + wtarg: -ops ['"load", "read", "update", "insert"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-lsm @@ -3054,6 +3060,7 @@ tasks: vars: perf-test-name: small-btree maxruns: 1 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: small-btree @@ -3068,6 +3075,7 @@ tasks: vars: perf-test-name: small-btree-backup maxruns: 1 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: small-btree-backup @@ -3082,6 +3090,7 @@ tasks: vars: perf-test-name: medium-btree maxruns: 3 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: medium-btree @@ -3096,6 +3105,7 @@ tasks: vars: perf-test-name: medium-btree-backup maxruns: 3 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: medium-btree-backup @@ -3110,6 +3120,7 @@ tasks: vars: perf-test-name: parallel-pop-btree maxruns: 1 + wtarg: -ops ['"load"'] - func: "upload-perf-test-stats" vars: perf-test-name: parallel-pop-btree @@ -3124,6 +3135,7 @@ tasks: vars: perf-test-name: update-only-btree maxruns: 3 + wtarg: -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-only-btree @@ -3138,7 +3150,7 @@ tasks: vars: perf-test-name: update-btree maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-btree.json" + wtarg: "-bf ../../../bench/wtperf/runners/update-btree.json" - func: "upload-perf-test-stats" vars: perf-test-name: update-btree @@ -3153,6 +3165,7 @@ tasks: vars: perf-test-name: update-large-record-btree maxruns: 3 + wtarg: -ops ['"load", "update"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-large-record-btree @@ -3167,6 +3180,7 @@ tasks: vars: perf-test-name: modify-large-record-btree maxruns: 3 + wtarg: -ops ['"load", "modify"'] - func: "upload-perf-test-stats" vars: perf-test-name: modify-large-record-btree @@ -3181,6 +3195,7 @@ tasks: vars: perf-test-name: modify-force-update-large-record-btree maxruns: 3 + wtarg: -ops ['"load", "modify"'] - func: "upload-perf-test-stats" vars: perf-test-name: modify-force-update-large-record-btree @@ -3199,7 +3214,7 @@ tasks: vars: perf-test-name: update-checkpoint-btree maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-checkpoint.json" + wtarg: "-bf ../../../bench/wtperf/runners/update-checkpoint.json" - func: "upload-perf-test-stats" vars: perf-test-name: update-checkpoint-btree @@ -3214,7 +3229,7 @@ tasks: vars: perf-test-name: update-checkpoint-lsm maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-checkpoint.json" + wtarg: "-bf ../../../bench/wtperf/runners/update-checkpoint.json" - func: "upload-perf-test-stats" vars: perf-test-name: update-checkpoint-lsm @@ -3233,6 +3248,7 @@ tasks: vars: perf-test-name: overflow-10k maxruns: 1 + wtarg: -ops ['"load", "read", "update"'] - func: "upload-perf-test-stats" vars: perf-test-name: overflow-10k @@ -3247,6 +3263,7 @@ tasks: vars: perf-test-name: overflow-130k maxruns: 1 + wtarg: -ops ['"load", "read", "update"'] - func: "upload-perf-test-stats" vars: perf-test-name: overflow-130k @@ -3261,6 +3278,7 @@ tasks: vars: perf-test-name: parallel-pop-stress maxruns: 1 + wtarg: -ops ['"load"'] - func: "upload-perf-test-stats" vars: perf-test-name: parallel-pop-stress @@ -3275,7 +3293,7 @@ tasks: vars: perf-test-name: update-grow-stress maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-stress.json" + wtarg: -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-grow-stress @@ -3290,7 +3308,7 @@ tasks: vars: perf-test-name: update-shrink-stress maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-stress.json" + wtarg: -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-shrink-stress @@ -3305,7 +3323,7 @@ tasks: vars: perf-test-name: update-delta-mix1 maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-stress.json" + wtarg: -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-delta-mix1 @@ -3320,7 +3338,7 @@ tasks: vars: perf-test-name: update-delta-mix2 maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-stress.json" + wtarg: -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-delta-mix2 @@ -3335,7 +3353,7 @@ tasks: vars: perf-test-name: update-delta-mix3 maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/update-stress.json" + wtarg: -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: update-delta-mix3 @@ -3350,10 +3368,12 @@ tasks: vars: perf-test-name: multi-btree-zipfian-populate maxruns: 1 + wtarg: -ops ['"read"'] - func: "run-perf-test" vars: perf-test-name: multi-btree-zipfian-workload maxruns: 1 + wtarg: -ops ['"read"'] - func: "upload-perf-test-stats" vars: perf-test-name: multi-btree-zipfian @@ -3390,7 +3410,7 @@ tasks: vars: perf-test-name: evict-fairness maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/evict-fairness.json" + wtarg: -args ['"-C statistics_log=(wait=10000,on_close=true,json=false,sources=[file:])", "-o reopen_connection=false"'] -ops ['"eviction_page_seen"'] - name: perf-test-evict-btree-stress-multi tags: ["stress-perf"] @@ -3402,7 +3422,7 @@ tasks: vars: perf-test-name: evict-btree-stress-multi maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/evict-btree-stress-multi.json" + wtarg: -ops ['"warnings", "max_latencies"'] - func: "upload-perf-test-stats" vars: perf-test-name: evict-btree-stress-multi @@ -3421,6 +3441,7 @@ tasks: vars: perf-test-name: evict-btree maxruns: 1 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: evict-btree @@ -3435,6 +3456,7 @@ tasks: vars: perf-test-name: evict-btree-1 maxruns: 1 + wtarg: -ops ['"read"'] - func: "upload-perf-test-stats" vars: perf-test-name: evict-btree-1 @@ -3449,6 +3471,7 @@ tasks: vars: perf-test-name: evict-lsm maxruns: 1 + wtarg: -ops ['"load", "read"'] - func: "upload-perf-test-stats" vars: perf-test-name: evict-lsm @@ -3463,6 +3486,7 @@ tasks: vars: perf-test-name: evict-lsm-1 maxruns: 1 + wtarg: -ops ['"read"'] - func: "upload-perf-test-stats" vars: perf-test-name: evict-lsm-1 @@ -3481,7 +3505,7 @@ tasks: vars: perf-test-name: log maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/log.json" + wtarg: -ops ['"update", "max_update_throughput", "min_update_throughput"'] - func: "upload-perf-test-stats" vars: perf-test-name: log @@ -3496,7 +3520,7 @@ tasks: vars: perf-test-name: log maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/log_small_files.json" + wtarg: -args ['"-C log=(enabled,file_max=1M)"'] -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: log-small-files @@ -3511,7 +3535,7 @@ tasks: vars: perf-test-name: log maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/log_no_checkpoints.json" + wtarg: -args ['"-C checkpoint=(wait=0)"'] -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: log-no-checkpoints @@ -3526,7 +3550,7 @@ tasks: vars: perf-test-name: log maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/log_no_prealloc.json" + wtarg: -args ['"-C log=(enabled,file_max=1M,prealloc=false)"'] -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: log-no-prealloc @@ -3541,7 +3565,7 @@ tasks: vars: perf-test-name: log maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/log_zero_fill.json" + wtarg: -args ['"-C log=(enabled,file_max=1M,zero_fill=true)"'] -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: log-zero-fill @@ -3556,7 +3580,7 @@ tasks: vars: perf-test-name: log maxruns: 1 - wtarg: "-a ../../../bench/wtperf/runners/log_many_threads.json" + wtarg: -args ['"-C log=(enabled,file_max=1M),session_max=256", "-o threads=((count=128,updates=1))"'] -ops ['"update"'] - func: "upload-perf-test-stats" vars: perf-test-name: log-many-threads -- cgit v1.2.1