From 2f6c88f9c1c616a10dc148bf7c4b21be49e77770 Mon Sep 17 00:00:00 2001 From: Xuezhao Liu Date: Wed, 5 Jul 2023 03:14:10 +0000 Subject: [PATCH] DAOS-13380 engine: some fixes Test-tag: daily_regression full_regression Required-githooks: true Signed-off-by: Xuezhao Liu --- src/tests/ftest/control/daos_agent_config.py | 3 ++- src/tests/ftest/control/daos_control_config.py | 3 ++- src/tests/ftest/control/daos_system_query.yaml | 1 + src/tests/ftest/control/dmg_pool_query_test.yaml | 6 +++--- src/tests/ftest/control/ms_resilience.py | 4 +++- src/tests/ftest/control/version.py | 3 ++- src/tests/ftest/dfuse/daos_build.py | 2 ++ src/tests/ftest/pool/query_attribute.yaml | 2 +- src/tests/ftest/server/daos_server_config.yaml | 5 ----- src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml | 2 +- 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/tests/ftest/control/daos_agent_config.py b/src/tests/ftest/control/daos_agent_config.py index a191180cf44f..c69cc0637ca9 100644 --- a/src/tests/ftest/control/daos_agent_config.py +++ b/src/tests/ftest/control/daos_agent_config.py @@ -3,7 +3,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent """ -from apricot import TestWithServers +from apricot import TestWithServers, skipForTicket from agent_utils import include_local_host from exception_utils import CommandFailure @@ -23,6 +23,7 @@ def __init__(self, *args, **kwargs): self.setup_start_agents = False self.setup_start_servers = False + @skipForTicket("DAOS-13380") def test_daos_agent_config_basic(self): """ JIRA ID: DAOS-1508 diff --git a/src/tests/ftest/control/daos_control_config.py b/src/tests/ftest/control/daos_control_config.py index 98044e1a0f54..8de00343cee5 100644 --- a/src/tests/ftest/control/daos_control_config.py +++ b/src/tests/ftest/control/daos_control_config.py @@ -5,7 +5,7 @@ """ -from apricot import TestWithServers +from apricot import TestWithServers, skipForTicket from exception_utils import CommandFailure @@ -16,6 +16,7 @@ class DaosControlConfigTest(TestWithServers): :avocado: recursive """ + @skipForTicket("DAOS-13380") def test_daos_control_config_basic(self): """ JIRA ID: DAOS-1508 diff --git a/src/tests/ftest/control/daos_system_query.yaml b/src/tests/ftest/control/daos_system_query.yaml index 9b1a343c11d7..3cf313475b96 100644 --- a/src/tests/ftest/control/daos_system_query.yaml +++ b/src/tests/ftest/control/daos_system_query.yaml @@ -7,6 +7,7 @@ server_config: engines: 0: pinned_numa_node: 0 + targets: 4 nr_xs_helpers: 1 fabric_iface_port: 31416 log_file: daos_server0.log diff --git a/src/tests/ftest/control/dmg_pool_query_test.yaml b/src/tests/ftest/control/dmg_pool_query_test.yaml index 3cf5b7bd137c..26616c46cbb5 100644 --- a/src/tests/ftest/control/dmg_pool_query_test.yaml +++ b/src/tests/ftest/control/dmg_pool_query_test.yaml @@ -8,7 +8,7 @@ server_config: engines_per_host: 1 engines: 0: - targets: 8 + targets: 4 storage: auto system_ram_reserved: 64 pool: @@ -26,8 +26,8 @@ ior: exp_vals: pool_status: 0 - total_targets: 8 - active_targets: 8 + total_targets: 4 + active_targets: 4 total_engines: 1 disabled_targets: 0 version: 1 diff --git a/src/tests/ftest/control/ms_resilience.py b/src/tests/ftest/control/ms_resilience.py index ff8ff58b3d64..99daed2fb9b6 100644 --- a/src/tests/ftest/control/ms_resilience.py +++ b/src/tests/ftest/control/ms_resilience.py @@ -8,7 +8,7 @@ from ClusterShell.NodeSet import NodeSet -from apricot import TestWithServers +from apricot import TestWithServers, skipForTicket from run_utils import stop_processes @@ -323,6 +323,7 @@ def test_ms_resilience_2(self): # Run test cases self.verify_retained_quorum(2) + @skipForTicket("DAOS-13380") def test_ms_resilience_3(self): """ JIRA ID: DAOS-3798 @@ -340,6 +341,7 @@ def test_ms_resilience_3(self): # Run test case self.verify_regained_quorum(1) + @skipForTicket("DAOS-13380") def test_ms_resilience_4(self): """ JIRA ID: DAOS-3798 diff --git a/src/tests/ftest/control/version.py b/src/tests/ftest/control/version.py index ce74549d03e0..c5bdff58d48a 100644 --- a/src/tests/ftest/control/version.py +++ b/src/tests/ftest/control/version.py @@ -6,7 +6,7 @@ import re import json -from apricot import TestWithServers +from apricot import TestWithServers, skipForTicket from general_utils import run_pcmd, report_errors from server_utils_base import DaosServerCommandRunner @@ -26,6 +26,7 @@ def __init__(self, *args, **kwargs): self.setup_start_servers = False self.setup_start_agents = False + @skipForTicket("DAOS-13380") def test_version(self): """Verify version number for dmg, daos, daos_server, and daos_agent against RPM. diff --git a/src/tests/ftest/dfuse/daos_build.py b/src/tests/ftest/dfuse/daos_build.py index 3e0076e24e8c..f45455bba15e 100644 --- a/src/tests/ftest/dfuse/daos_build.py +++ b/src/tests/ftest/dfuse/daos_build.py @@ -9,6 +9,7 @@ from dfuse_test_base import DfuseTestBase from run_utils import run_remote +from apricot import skipForTicket class DaosBuild(DfuseTestBase): @@ -49,6 +50,7 @@ def test_dfuse_daos_build_wt(self): """ self.run_build_test("writethrough") + @skipForTicket("DAOS-13380") def test_dfuse_daos_build_wt_il(self): """This test builds DAOS on a dfuse filesystem. diff --git a/src/tests/ftest/pool/query_attribute.yaml b/src/tests/ftest/pool/query_attribute.yaml index d91f36ac52fe..7222fedd84cf 100644 --- a/src/tests/ftest/pool/query_attribute.yaml +++ b/src/tests/ftest/pool/query_attribute.yaml @@ -6,7 +6,7 @@ server_config: engines_per_host: 1 engines: 0: - targets: 8 + targets: 4 nr_xs_helpers: 0 storage: 0: diff --git a/src/tests/ftest/server/daos_server_config.yaml b/src/tests/ftest/server/daos_server_config.yaml index 0a659990306f..b7f01f43d1da 100644 --- a/src/tests/ftest/server/daos_server_config.yaml +++ b/src/tests/ftest/server/daos_server_config.yaml @@ -164,11 +164,6 @@ server_config_val: !mux - "nr_xs_helpers" - -10000 - "PASS" - targets_negative: - config_val: - - "targets" - - -1 - - "PASS" targets_str: config_val: - "targets" diff --git a/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml b/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml index acd2fa472df3..f28a32a17332 100644 --- a/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml +++ b/src/tests/ftest/telemetry/dkey_akey_enum_punch.yaml @@ -7,7 +7,7 @@ server_config: engines_per_host: 1 engines: 0: - targets: 8 + targets: 4 nr_xs_helpers: 0 storage: 0: