Skip to content

UCP/RNDV: Fix releasing of local request ID when switching to RNDV AM (v1.10.x) #6117

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
brminich merged 1 commit into from
Jan 14, 2021
Merged

UCP/RNDV: Fix releasing of local request ID when switching to RNDV AM (v1.10.x) #6117

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
8 changes: 5 additions & 3 deletions src/ucp/rndv/rndv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1720,6 +1720,9 @@ UCS_PROFILE_FUNC(ucs_status_t, ucp_rndv_rtr_handler,
ucs_status_t status;
int is_pipeline_rndv;

ucs_assertv(rndv_rtr_hdr->sreq_id == sreq->send.msg_proto.sreq_id,
"received local sreq_id 0x%"PRIx64" is not equal to expected sreq_id"
" 0x%"PRIx64, rndv_rtr_hdr->sreq_id, sreq->send.msg_proto.sreq_id);
ucp_trace_req(sreq, "received rtr address 0x%"PRIx64" remote rreq_id"
"0x%"PRIx64, rndv_rtr_hdr->address, rndv_rtr_hdr->rreq_id);
UCS_PROFILE_REQUEST_EVENT(sreq, "rndv_rtr_recv", 0);
Expand Down Expand Up @@ -1814,9 +1817,8 @@ UCS_PROFILE_FUNC(ucs_status_t, ucp_rndv_rtr_handler,
}

out_send:
/* if it not a PUT pipeline protocol, delete the send request ID */
ucp_worker_del_request_id(worker, sreq,
sreq->send.msg_proto.sreq_id);
/* if it is not a PUT pipeline protocol, delete the send request ID */
ucp_worker_del_request_id(worker, sreq, rndv_rtr_hdr->sreq_id);
ucp_request_send(sreq, 0);
return UCS_OK;
}
Expand Down