Skip to content

UCS/UCT/JENKINS: Enable the loopback IP as a tcp and testing resource #6198

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

Merged
yosefe merged 1 commit into from
Jan 27, 2021
Merged

UCS/UCT/JENKINS: Enable the loopback IP as a tcp and testing resource #6198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions contrib/test_jenkins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ rename_files() {
}

run_client_server_app() {
test_name=$1
test_exe=$1
test_args=$2
server_addr_arg=$3
kill_server=$4
Expand All @@ -801,7 +801,7 @@ run_client_server_app() {
affinity_server=$(slice_affinity 0)
affinity_client=$(slice_affinity 1)

taskset -c $affinity_server ${test_name} ${test_args} ${server_port_arg} &
taskset -c $affinity_server ${test_exe} ${test_args} ${server_port_arg} &
server_pid=$!

sleep 15
Expand All @@ -811,7 +811,7 @@ run_client_server_app() {
set +Ee
fi

taskset -c $affinity_client ${test_name} ${test_args} ${server_addr_arg} ${server_port_arg} &
taskset -c $affinity_client ${test_exe} ${test_args} ${server_addr_arg} ${server_port_arg} &
client_pid=$!

wait ${client_pid}
Expand Down Expand Up @@ -959,8 +959,10 @@ run_ucp_client_server() {
}

run_io_demo() {
server_ip=$(get_rdma_device_ip_addr)
if [ "$server_ip" == "" ]
server_rdma_addr=$(get_rdma_device_ip_addr)
server_loopback_addr="127.0.0.1"

if [ "$server_rdma_addr" == "" ]
Comment thread
yosefe marked this conversation as resolved.
Resolved
then
return
fi
Expand All @@ -976,7 +978,11 @@ run_io_demo() {
fi

export UCX_SOCKADDR_CM_ENABLE=y
run_client_server_app "./test/apps/iodemo/${test_name}" "${test_args}" "${server_ip}" 1 0

for server_ip in $server_rdma_addr $server_loopback_addr
do
run_client_server_app "./test/apps/iodemo/${test_name}" "${test_args}" "${server_ip}" 1 0
done

unset UCX_SOCKADDR_CM_ENABLE
make_clean
Expand Down
2 changes: 1 addition & 1 deletion src/ucs/sys/sock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void ucs_close_fd(int *fd_p)

int ucs_netif_flags_is_active(unsigned int flags)
{
return (flags & IFF_UP) && (flags & IFF_RUNNING) && !(flags & IFF_LOOPBACK);
return (flags & IFF_UP) && (flags & IFF_RUNNING);
}

ucs_status_t ucs_netif_ioctl(const char *if_name, unsigned long request,
Expand Down
4 changes: 2 additions & 2 deletions src/uct/ib/rdmacm/rdmacm_cm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ static void uct_rdmacm_cm_handle_event_addr_resolved(struct rdma_cm_event *event
event->id);

if (rdma_resolve_route(event->id, 1000 /* TODO */)) {
ucs_error("%s: rdma_resolve_route failed: %m",
ucs_diag("%s: rdma_resolve_route failed: %m",
uct_rdmacm_cm_ep_str(cep, ep_str, UCT_RDMACM_EP_STRING_LEN));
remote_data.field_mask = 0;
uct_rdmacm_cm_ep_set_failed(cep, &remote_data, UCS_ERR_IO_ERROR);
uct_rdmacm_cm_ep_set_failed(cep, &remote_data, UCS_ERR_UNREACHABLE);
}
}

Expand Down