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

Jump to bottom

UCP/EP/FLUSH: fix error handling flow #93

Merged
merged 1 commit into from
Nov 23, 2020
Merged

UCP/EP/FLUSH: fix error handling flow #93

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
11 changes: 7 additions & 4 deletions src/ucp/rma/flush.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@

static void ucp_ep_flush_error(ucp_request_t *req, ucs_status_t status)
{
if (ucp_ep_config(req->send.ep)->key.err_mode != UCP_ERR_HANDLING_MODE_PEER) {
ucs_error("error during flush: %s", ucs_status_string(status));
}
ucs_log_level_t level = (ucp_ep_config(req->send.ep)->key.err_mode ==
UCP_ERR_HANDLING_MODE_PEER) ?
UCS_LOG_LEVEL_TRACE_REQ : UCS_LOG_LEVEL_ERROR;

req->status = status;
--req->send.state.uct_comp.count;
ucs_log(level, "req %p: error during flush: %s, flush comp %p count reduced to %d",
req, ucs_status_string(status), &req->send.state.uct_comp,
req->send.state.uct_comp.count);
}

static int ucp_ep_flush_is_completed(ucp_request_t *req)
Expand Down Expand Up @@ -129,7 +132,7 @@ static void ucp_ep_flush_progress(ucp_request_t *req)
}
} else {
ucp_ep_flush_error(req, status);
break;
req->send.flush.started_lanes |= UCS_BIT(lane);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixes hang when uct_ep_flush() returns error from failed_ep ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

}
}

Expand Down