From 852280a4d1b8f26f8862dc7cdc7970f631a96cdc Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 14 Sep 2022 10:11:32 -0700 Subject: [PATCH] Add an option to disable kernel-aio in test harness I'm using this for experimenting with criu: https://criu.org/Main_Page, which doesn't support kernel aio. --- contrib/TestHarness2/test_harness/config.py | 1 + contrib/TestHarness2/test_harness/run.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/contrib/TestHarness2/test_harness/config.py b/contrib/TestHarness2/test_harness/config.py index 25e8553782..191fab629d 100644 --- a/contrib/TestHarness2/test_harness/config.py +++ b/contrib/TestHarness2/test_harness/config.py @@ -141,6 +141,7 @@ class Config: self.old_binaries_path_args = {'help': 'Path to the directory containing the old fdb binaries'} self.tls_plugin_path: Path = Path('/app/deploy/runtime/.tls_5_1/FDBLibTLS.so') self.tls_plugin_path_args = {'help': 'Path to the tls plugin used for binaries < 5.2.0'} + self.disable_kaio: bool = False self.use_valgrind: bool = False self.use_valgrind_args = {'action': 'store_true'} self.buggify = BuggifyOption('random') diff --git a/contrib/TestHarness2/test_harness/run.py b/contrib/TestHarness2/test_harness/run.py index d4beaeea8e..f144ded0da 100644 --- a/contrib/TestHarness2/test_harness/run.py +++ b/contrib/TestHarness2/test_harness/run.py @@ -351,6 +351,8 @@ class TestRun: if self.use_tls_plugin: command += ['--tls_plugin', str(config.tls_plugin_path)] env["FDB_TLS_PLUGIN"] = str(config.tls_plugin_path) + if config.disable_kaio: + command += ['--knob-disable-posix-kernel-aio=1'] if Version.of_binary(self.binary) >= '7.1.0': command += ['-fi', 'on' if self.fault_injection_enabled else 'off'] if self.restarting: