-
Notifications
You must be signed in to change notification settings - Fork 341
DAOS-18768 cart: Change default mrc settings #17948
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
4bffb8e
bcb269b
53f9018
4e48adc
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -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; | ||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i believe it is clearer to keep the original and spell out the two cases explicitly with "?" |
||||||
| crt_env_get(CRT_MRC_ENABLE, &mrc_enable); | ||||||
|
|
||||||
| if (mrc_enable == 0) { | ||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| 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; | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not make it a boolean ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
needs to be uint32_t for crt_env stuff. server is also currently defined as int, so changing all to bools would be messier in this pr