From 567348c223ee3a9d83feb8fa2e942b994a5ca437 Mon Sep 17 00:00:00 2001 From: filipecosta90 Date: Fri, 17 Nov 2023 20:03:00 +0000 Subject: [PATCH] Cluster mode cannot be specified when importing --- memtier_benchmark.cpp | 5 +++++ tests/tests_oss_simple_flow.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/memtier_benchmark.cpp b/memtier_benchmark.cpp index 26e585cf..136dda79 100755 --- a/memtier_benchmark.cpp +++ b/memtier_benchmark.cpp @@ -1484,6 +1484,11 @@ int main(int argc, char *argv[]) } assert(obj_gen != NULL); } else { + // oss cluster API can't be enabled + if (cfg.cluster_mode) { + fprintf(stderr, "error: Cluster mode cannot be specified when importing.\n"); + exit(1); + } // check paramters if (cfg.data_size || cfg.data_size_list.is_defined() || diff --git a/tests/tests_oss_simple_flow.py b/tests/tests_oss_simple_flow.py index d08ecd4d..fef399c5 100644 --- a/tests/tests_oss_simple_flow.py +++ b/tests/tests_oss_simple_flow.py @@ -420,6 +420,7 @@ def test_default_set_get_rate_limited(env): assert_minimum_memtier_outcomes(config, env, memtier_ok, overall_expected_request_count, overall_request_count, request_delta) def test_data_import(env): + env.skipOnCluster() benchmark_specs = {"name": env.testName, "args": [f"--data-import={ROOT_FOLDER}/tests/data-import-2-keys.txt",'--ratio=1:1']} addTLSArgs(benchmark_specs, env) config = get_default_memtier_config() @@ -451,6 +452,7 @@ def test_data_import(env): def test_data_import_setex(env): + env.skipOnCluster() benchmark_specs = {"name": env.testName, "args": [f"--data-import={ROOT_FOLDER}/tests/data-import-2-keys-expiration.txt",'--ratio=1:1']} addTLSArgs(benchmark_specs, env) config = get_default_memtier_config()