DAOS-14669 test: switch tcp;ofi_rxm testing to tcp

Test-provider: ofi+tcp Test-provider-hw-medium: ofi+tcp Test-provider-hw-large: ofi+tcp Test-tag: full_regression Required-githooks: true Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
daos-stack · Nov 20, 2023 · f2015f8 · f2015f8
1 parent f5c1707
commit f2015f8
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 33 deletions.
diff --git a/src/tests/ftest/cart/corpc/corpc_five_node.yaml b/src/tests/ftest/cart/corpc/corpc_five_node.yaml
@@ -10,7 +10,7 @@ ENV:
     - test_servers_CRT_CTX_NUM: "0"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/corpc/corpc_two_node.yaml b/src/tests/ftest/cart/corpc/corpc_two_node.yaml
@@ -10,7 +10,7 @@ ENV:
     - test_servers_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/ctl/ctl_five_node.yaml b/src/tests/ftest/cart/ctl/ctl_five_node.yaml
@@ -11,7 +11,7 @@ ENV:
     - test_clients_CRT_CTX_NUM: "0"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.yaml b/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.yaml
@@ -10,7 +10,7 @@ ENV:
     - test_servers_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/group_test/group_test.yaml b/src/tests/ftest/cart/group_test/group_test.yaml
@@ -8,7 +8,7 @@ ENV:
     - OFI_INTERFACE: "eth0"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
   hosts_1:
     config: one_node

diff --git a/src/tests/ftest/cart/iv/iv_one_node.yaml b/src/tests/ftest/cart/iv/iv_one_node.yaml
@@ -18,7 +18,7 @@ env_CRT_PHY_ADDR_STR: !mux
   sm:
     CRT_PHY_ADDR_STR: "sm"
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
   hosts_1:
     config: one_node

diff --git a/src/tests/ftest/cart/iv/iv_two_node.yaml b/src/tests/ftest/cart/iv/iv_two_node.yaml
@@ -12,7 +12,7 @@ ENV:
     - CRT_TEST_CONT: "1"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/no_pmix/multictx_one_node.yaml b/src/tests/ftest/cart/no_pmix/multictx_one_node.yaml
@@ -13,7 +13,7 @@ env_CRT_PHY_ADDR_STR: !mux
   sm:
     CRT_PHY_ADDR_STR: "sm"
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 tests: !mux
   no_pmix_multi_ctx:
     name: no_pmix_multi_ctx

diff --git a/src/tests/ftest/cart/no_pmix_group_test.c b/src/tests/ftest/cart/no_pmix_group_test.c
@@ -684,7 +684,7 @@ int main(int argc, char **argv)
 	}
 
 	for (i = 0; i < 10; i++) {
-		rc = asprintf(&uris[i], "ofi+tcp;ofi_rxm://127.0.0.1:%d",
+		rc = asprintf(&uris[i], "ofi+tcp://127.0.0.1:%d",
 				10000 + i);
 		if (rc == -1) {
 			D_ERROR("asprintf() failed\n");

diff --git a/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.yaml b/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.yaml
@@ -8,7 +8,7 @@ ENV:
     - OFI_INTERFACE: "eth0"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
   hosts_1:
     config: one_node

diff --git a/src/tests/ftest/cart/rpc/multisend_one_node.yaml b/src/tests/ftest/cart/rpc/multisend_one_node.yaml
@@ -17,7 +17,7 @@ env_CRT_CTX_SHARE_ADDR: !mux
     CRT_CTX_SHARE_ADDR: "0"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
   hosts_1:
     config: one_node

diff --git a/src/tests/ftest/cart/rpc/rpc_one_node.yaml b/src/tests/ftest/cart/rpc/rpc_one_node.yaml
@@ -19,7 +19,7 @@ env_CRT_PHY_ADDR_STR: !mux
   sm:
     CRT_PHY_ADDR_STR: "sm"
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
   hosts_1:
     config: one_node

diff --git a/src/tests/ftest/cart/rpc/rpc_two_node.yaml b/src/tests/ftest/cart/rpc/rpc_two_node.yaml
@@ -11,7 +11,7 @@ ENV:
     - test_clients_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/rpc/swim_notification.yaml b/src/tests/ftest/cart/rpc/swim_notification.yaml
@@ -12,7 +12,7 @@ ENV:
     - test_clients_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/selftest/selftest_three_node.yaml b/src/tests/ftest/cart/selftest/selftest_three_node.yaml
@@ -11,7 +11,7 @@ ENV:
     - test_clients_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
   ofi_tcp:
-    CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+    CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
   no_sep:
     env: no_sep

diff --git a/src/tests/ftest/cart/utest/utest_portnumber.c b/src/tests/ftest/cart/utest/utest_portnumber.c
@@ -192,7 +192,7 @@ static void
 test_port_tcp(void **state)
 {
 	setenv("OFI_INTERFACE", "lo", 1);
-	setenv("CRT_PHY_ADDR_STR", "ofi+tcp;ofi_rxm", 1);
+	setenv("CRT_PHY_ADDR_STR", "ofi+tcp", 1);
 	run_test_fork(state);
 }
 

diff --git a/src/tests/ftest/control/config_generate_output.py b/src/tests/ftest/control/config_generate_output.py
@@ -23,7 +23,7 @@ def __init__(self, *args, **kwargs):
         """Initialize a ConfigGenerateOutput object."""
         super().__init__(*args, **kwargs)
 
-        self.def_provider = "ofi+tcp;ofi_rxm"
+        self.def_provider = "ofi+tcp"
 
         # Data structure that store expected values.
         self.numa_node_to_pci_addrs = defaultdict(set)

diff --git a/src/tests/ftest/control/config_generate_run.yaml b/src/tests/ftest/control/config_generate_run.yaml
@@ -16,34 +16,34 @@ setup:
 config_generate_params: !mux
   # 1. Access points only. Use default for others.
   all_default:
-    net_provider: ofi+tcp;ofi_rxm
+    net_provider: ofi+tcp
   # 2. Use one engine.
   single_engine:
     num_engines: 1
-    net_provider: ofi+tcp;ofi_rxm
+    net_provider: ofi+tcp
   # 3. Use scm_only=false. This will use the maximum number of SSDs, so the
   # generated config file should be identical to all_default.
   scm_only_false:
     scm_only: false
-    net_provider: ofi+tcp;ofi_rxm
+    net_provider: ofi+tcp
   # 4. Use scm_only=true. No NVMe entry. SCM only.
   scm_only_true:
     scm_only: true
-    net_provider: ofi+tcp;ofi_rxm
+    net_provider: ofi+tcp
   # 5. Use infiniband. This is usually the default behavior, so the generated
   # config file would be identical to all_default if the feature is working
   # correctly.
   infiniband:
     net_class: infiniband
-    net_provider: ofi+tcp;ofi_rxm
+    net_provider: ofi+tcp
   # 6. Use ethernet. There's usually only one ethernet interface available, so
   # use one engine. Each engine would need different interface. We could come up
   # with the maximum usable count, but that's out of scope.
   ethernet:
     net_class: ethernet
     num_engines: 1
-    net_provider: ofi+tcp;ofi_rxm
+    net_provider: ofi+tcp
   # 7. Use tmpfs for scm instead of pmem.
   tmpfs_scm_true:
     use_tmpfs_scm: true
-    net_provider: ofi+tcp;ofi_rxm
+    net_provider: ofi+tcp
diff --git a/src/tests/ftest/server/multiengine_persocket.yaml b/src/tests/ftest/server/multiengine_persocket.yaml
@@ -85,7 +85,7 @@ agent_config:
 dmg:
   transport_config:
     allow_insecure: false
-provider: ofi+tcp;ofi_rxm
+provider: ofi+tcp
 pool:
   control_method: dmg
   scm_size: 1G

diff --git a/src/tests/ftest/util/dmg_utils.py b/src/tests/ftest/util/dmg_utils.py
@@ -120,7 +120,7 @@ def network_scan(self, provider=None):
         #           ],
         #           "Providers": [
         #             "ofi+verbs;ofi_rxm",
-        #             "ofi+tcp;ofi_rxm",
+        #             "ofi+tcp",
         #             "ofi+verbs",
         #             "ofi+tcp",
         #             "ofi+sockets"
@@ -1180,7 +1180,7 @@ def config_generate(self, access_points, num_engines=None, scm_only=False,
             net_class (str): Network class preferred. Defaults to None.
                 i.e. "ethernet"|"infiniband"
             net_provider (str): Network provider preferred. Defaults to None.
-                i.e. "ofi+tcp;ofi_rxm" etc.
+                i.e. "ofi+tcp" etc.
             use_tmpfs_scm (bool, optional): Whether to use a ramdisk instead of PMem
                 as SCM. Defaults to False.
             control_metadata_path (str): External directory provided to store control

diff --git a/src/tests/ftest/util/network_utils.py b/src/tests/ftest/util/network_utils.py
@@ -16,12 +16,12 @@
     "ofi+cxi",
     "ofi+verbs;ofi_rxm",
     "ucx+dc_x",
-    "ofi+tcp;ofi_rxm",
+    "ofi+tcp",
     "ofi+opx"
 )
 PROVIDER_ALIAS = {
     "ofi+verbs": "ofi+verbs;ofi_rxm",
-    "ofi+tcp": "ofi+tcp;ofi_rxm"
+    "ofi+tcp": "ofi+tcp"
 }
 
 

diff --git a/src/tests/ftest/util/server_utils_params.py b/src/tests/ftest/util/server_utils_params.py
@@ -436,7 +436,7 @@ class EngineYamlParameters(YamlParameters):
         "common": [
             "D_LOG_FILE_APPEND_PID=1",
             "COVFILE=/tmp/test.cov"],
-        "ofi+tcp;ofi_rxm": [],
+        "ofi+tcp": [],
         "ofi+verbs": [
             "FI_OFI_RXM_USE_SRX=1"],
         "ofi+cxi": [
@@ -458,7 +458,7 @@ def __init__(self, base_namespace, index, provider=None, max_storage_tiers=MAX_S
         namespace = [os.sep] + base_namespace.split(os.sep)[1:-1] + ["engines", str(index), "*"]
         self._base_namespace = base_namespace
         self._index = index
-        self._provider = provider or os.environ.get("CRT_PHY_ADDR_STR", "ofi+tcp;ofi_rxm")
+        self._provider = provider or os.environ.get("CRT_PHY_ADDR_STR", "ofi+tcp")
         self._max_storage_tiers = max_storage_tiers
         super().__init__(os.path.join(*namespace))
 

diff --git a/utils/docker/vcluster/daos-server/el8/daos_server.yml.in b/utils/docker/vcluster/daos-server/el8/daos_server.yml.in
@@ -4,7 +4,7 @@ name: daos_server
 access_points: ['daos-server']
 port: 10001
 
-provider: ofi+tcp;ofi_rxm
+provider: ofi+tcp
 socket_dir: /var/run/daos_server
 nr_hugepages: @DAOS_HUGEPAGES_NBR@
 

diff --git a/utils/nlt_server.yaml b/utils/nlt_server.yaml
@@ -1,6 +1,6 @@
 name: daos_server
 port: 10001
-provider: ofi+tcp;ofi_rxm
+provider: ofi+tcp
 disable_hugepages: true
 control_log_mask: DEBUG
 access_points: ['localhost:10001']