Skip to content

DAOS-17861 cart: fix err handling in corpc (#17299) #17328

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

Open
liuxuezhao wants to merge 1 commit into
base: release/2.6
Choose a base branch
from
Open

DAOS-17861 cart: fix err handling in corpc (#17299) #17328

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
41 changes: 27 additions & 14 deletions src/cart/crt_corpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,13 @@ crt_corpc_req_hdlr(struct crt_rpc_priv *rpc_priv)
opc_info = rpc_priv->crp_opc_info;
co_ops = opc_info->coi_co_ops;

if (rpc_priv->crp_fail_hlc)
D_GOTO(forward_done, rc = -DER_HLC_SYNC);
if (rpc_priv->crp_fail_hlc) {
rc = -DER_HLC_SYNC;
RPC_ERROR(rpc_priv, "crp_fail_hlc (group %s) failed: " DF_RC "\n",
co_info->co_grp_priv->gp_pub.cg_grpid, DP_RC(rc));
crt_corpc_fail_parent_rpc(rpc_priv, rc);
D_GOTO(forward_done, rc);
}

/* Invoke pre-forward callback first if it is registered */
if (co_ops && co_ops->co_pre_forward) {
Expand Down Expand Up @@ -908,20 +913,28 @@ crt_corpc_req_hdlr(struct crt_rpc_priv *rpc_priv)
}

forward_done:
if (rc != 0 && rpc_priv->crp_flags & CRT_RPC_FLAG_CO_FAILOUT)
co_failout = true;
if (rc != 0) {
/* reset rc to 0 as it already failed the parent/child RPC and
* will be replied/completed by crt_corpc_complete().
*/
rc = 0;
if (rpc_priv->crp_flags & CRT_RPC_FLAG_CO_FAILOUT)
co_failout = true;
}

/* NOOP bcast (no child and root excluded) */
if (co_info->co_child_num == 0 && (co_info->co_root_excluded || co_failout))
crt_corpc_complete(rpc_priv);
/* need not call local RPC handler */
if (co_info->co_root_excluded || co_failout) {
/* NOOP bcast (no child and root excluded) */
if (co_info->co_child_num == 0)
crt_corpc_complete(rpc_priv);

if (co_info->co_root_excluded == 1 || co_failout) {
if (co_info->co_grp_priv->gp_self == co_info->co_root) {
/* don't return error for root to avoid RPC_DECREF in
* fail case in crt_req_send.
*/
rc = 0;
}
/* Corresponding the initial ref 1 in crt_rpc_handler_common() ->
* crt_rpc_priv_init(rpc_priv, crt_ctx, true).
* That ref commonly will be released by crt_rpc_common_hdlr() -> crt_handle_rpc(),
* here as will not call crt_rpc_common_hdlr() so drop it explicitly.
*/
if (rpc_priv->crp_srv)
RPC_DECREF(rpc_priv);
D_GOTO(out, rc);
}

Expand Down
1 change: 1 addition & 0 deletions src/cart/crt_hg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,7 @@ crt_hg_reply_send(struct crt_rpc_priv *rpc_priv)

D_ASSERT(rpc_priv != NULL);

/* corresponds to decref in crt_hg_reply_send_cb */
RPC_ADDREF(rpc_priv);
hg_ret = HG_Respond(rpc_priv->crp_hg_hdl, crt_hg_reply_send_cb,
rpc_priv, &rpc_priv->crp_pub.cr_output);
Expand Down
Loading