Skip to content
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.

Sign up for GitHub

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

DAOS-13268 cart: Fix UCX to use rdmacm. #12075

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

DAOS-13268 cart: Fix UCX to use rdmacm. #12075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3fc16d3
DAOS-13268 cart: Fix UCX to use rdmacm.
jgmoore-or May 1, 2023
9c0622b
DAOS-13268 cart: Fix UCX.
jgmoore-or May 1, 2023
198bc34
DAOS-13268 cart: Fix UCX.
jgmoore-or May 2, 2023
9a216be
DAOS-13268 cart: Fix UCX.
jgmoore-or May 2, 2023
937c870
DAOS-13268 cart: Fix UCX.
jgmoore-or May 2, 2023
9a51e92
DAOS-13268 cart: Fix UCX.
jgmoore-or May 2, 2023
0e04cd7
DAOS-13268 cart: Fix UCX.
jgmoore-or May 2, 2023
721e0cd
DAOS-13268 cart: Fix UCX.
jgmoore-or May 4, 2023
46c4fe5
Merge branch 'master' into jgm/daos-13268
jgmoore-or May 5, 2023
75666de
Skip-build-leap15-icc: true
jgmoore-or May 5, 2023
b697562
Merge branch 'master' into jgm/daos-13268
jgmoore-or May 12, 2023
f9e2ffc
DAOS-13268 cart: Fix UCX.
jgmoore-or May 19, 2023
1405ffc
DAOS-13268 cart: Upgrade to UCX 1.14.
jgmoore-or May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ci/provisioning/post_provision_config_common_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,6 @@ post_provision_config_nodes() {
return 1
fi

if lspci | grep "ConnectX-6" && ! grep MOFED_VERSION /etc/do-release; then
# Remove OPA and install MOFED
install_mofed
fi

if [ -n "$INST_REPOS" ]; then
local repo
for repo in $INST_REPOS; do
Expand Down Expand Up @@ -309,6 +304,11 @@ post_provision_config_nodes() {
fi
fi

if lspci | grep "ConnectX-6" && ! grep MOFED_VERSION /etc/do-release; then
# Remove OPA and install MOFED
install_mofed
fi

# shellcheck disable=SC2001
if ! rpm -q "$(echo "$INST_RPMS" |
sed -e 's/--exclude [^ ]*//' \
Expand Down
3 changes: 3 additions & 0 deletions src/cart/crt_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@ static int data_init(int server, crt_init_options_t *opt)
if (server)
setenv("UCX_IB_FORK_INIT", "n", 1);

setenv("D_LOG_STDERR_IN_LOG", "1", 1);
setenv("UCX_DC_MLX5_NUM_DCI", "16", 1);

/* This is a workaround for CART-871 if universe size is not set */
d_getenv_int("FI_UNIVERSE_SIZE", &fi_univ_size);
if (fi_univ_size == 0) {
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/daos_test/dfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pool:
server_config:
name: daos_server
engines_per_host: 2
crt_timeout: 60
engines:
0:
pinned_numa_node: 0
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/ior/small.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ timeout: 700
server_config:
name: daos_server
engines_per_host: 2
crt_timeout: 60
engines:
0:
pinned_numa_node: 0
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/mdtest/small.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ timeout: 360
server_config:
name: daos_server
engines_per_host: 2
crt_timeout: 60
engines:
0:
pinned_numa_node: 0
Expand Down