diff --git a/src/cart/crt_init.c b/src/cart/crt_init.c index 69ca72f14f3..00b59b6e368 100644 --- a/src/cart/crt_init.c +++ b/src/cart/crt_init.c @@ -272,6 +272,7 @@ data_init(int server, crt_init_options_t *opt) unsigned int mrecv_buf = CRT_HG_MRECV_BUF; unsigned int mrecv_buf_copy = 0; /* buf copy disabled by default */ char *swim_traffic_class = NULL; + uint32_t mrc_enable = 0; int rc = 0; crt_env_dump(); @@ -351,8 +352,17 @@ data_init(int server, crt_init_options_t *opt) /* This is a workaround for CART-871 if universe size is not set */ crt_env_get(FI_UNIVERSE_SIZE, &fi_univ_size); - if (fi_univ_size == 0) { + if (fi_univ_size == 0) d_setenv("FI_UNIVERSE_SIZE", "2048", 1); + + /* Disable MRC on servers and enable on clients by default */ + mrc_enable = server ? 0 : 1; + crt_env_get(CRT_MRC_ENABLE, &mrc_enable); + + if (mrc_enable == 0) { + D_INFO("Disabling mr caching\n"); + d_setenv("FI_MR_CACHE_MAX_COUNT", "0", 1); + d_setenv("UCX_RCACHE_ENABLE", "n", 1); } /** enable sensors if requested */ @@ -549,8 +559,6 @@ file_limit_bump(void) static void prov_settings_apply(bool primary, crt_provider_t prov, crt_init_options_t *opt) { - uint32_t mrc_enable = 0; - /* Avoid applying same settings multiple times */ if (g_prov_settings_applied[prov] == true) return; @@ -567,15 +575,6 @@ prov_settings_apply(bool primary, crt_provider_t prov, crt_init_options_t *opt) if (prov == CRT_PROV_OFI_TCP || prov == CRT_PROV_OFI_TCP_RXM) file_limit_bump(); - if (prov == CRT_PROV_OFI_CXI) - mrc_enable = 1; - - crt_env_get(CRT_MRC_ENABLE, &mrc_enable); - if (mrc_enable == 0) { - D_INFO("Disabling MR CACHE (FI_MR_CACHE_MAX_COUNT=0)\n"); - d_setenv("FI_MR_CACHE_MAX_COUNT", "0", 1); - } - g_prov_settings_applied[prov] = true; } diff --git a/src/tests/ftest/cart/corpc/corpc_five_node.yaml b/src/tests/ftest/cart/corpc/corpc_five_node.yaml index 9a11f1f65ff..1e5919866a6 100644 --- a/src/tests/ftest/cart/corpc/corpc_five_node.yaml +++ b/src/tests/ftest/cart/corpc/corpc_five_node.yaml @@ -4,7 +4,7 @@ ENV: default: # !filter-only : /run/tests/corpc_prefwd - - D_LOG_MASK: "WARN,CORPC=DEBUG" + - D_LOG_MASK: "INFO,CORPC=DEBUG" - D_INTERFACE: "eth0" - test_servers_CRT_CTX_NUM: "0" env_D_PROVIDER: !mux diff --git a/src/tests/ftest/cart/corpc/corpc_one_node.yaml b/src/tests/ftest/cart/corpc/corpc_one_node.yaml index eb777f8f044..adf59bb283f 100644 --- a/src/tests/ftest/cart/corpc/corpc_one_node.yaml +++ b/src/tests/ftest/cart/corpc/corpc_one_node.yaml @@ -4,7 +4,7 @@ ENV: default: # !filter-only : /run/tests/corpc_prefwd - - D_LOG_MASK: "WARN,CORPC=DEBUG" + - D_LOG_MASK: "INFO,CORPC=DEBUG" - D_INTERFACE: "eth0" - test_servers_CRT_CTX_NUM: "16" env_D_PROVIDER: !mux diff --git a/src/tests/ftest/cart/corpc/corpc_two_node.yaml b/src/tests/ftest/cart/corpc/corpc_two_node.yaml index fbe6fee688b..bc5927d2eaf 100644 --- a/src/tests/ftest/cart/corpc/corpc_two_node.yaml +++ b/src/tests/ftest/cart/corpc/corpc_two_node.yaml @@ -4,7 +4,7 @@ ENV: default: # !filter-only : /run/tests/corpc_prefwd - - D_LOG_MASK: "WARN,CORPC=DEBUG" + - D_LOG_MASK: "INFO,CORPC=DEBUG" - D_INTERFACE: "eth0" - test_servers_CRT_CTX_NUM: "16" env_D_PROVIDER: !mux