ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/iscsi: Make delete_target_node RPC asynchronous

Browse Source 
delete_target_node RPC had not waited for completion of
spdk_iscsi_shutdown_tgt_node_by_name. This implementation
is not the direct cause of the deadlock issue in
spdk_iscsi_conn_stop() but changing delete_target_node RPC
to wait for completion of spdk_iscsi_shutdown_tgt_node_by_name
will prevent future errors.

spdk_iscsi_shutdown_tgt_node_by_name() is not asynchronized yet
and so rpc_delete_target_node calls rpc_delete_target_node_done
directly in this patch.

The next patch will replace the call.

Change-Id: I6a042028b93c36ca9f68e3b212141e101b33d394
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450604
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-04-09 14:22:19 +09:00 committed by Jim Harris
parent a5478cefbd
commit e057bb8581
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/iscsi/iscsi_rpc.c
View File

@ -653,44 +653,69 @@ static const struct spdk_json_object_decoder rpc_delete_target_node_decoders[] =
{"name", offsetof(struct rpc_delete_target_node, name), spdk_json_decode_string}, {"name", offsetof(struct rpc_delete_target_node, name), spdk_json_decode_string},
}; };
struct rpc_delete_target_node_ctx {
struct rpc_delete_target_node req;
struct spdk_jsonrpc_request *request;
};
static void
rpc_delete_target_node_done(void *cb_arg, int rc)
{
struct rpc_delete_target_node_ctx *ctx = cb_arg;
struct spdk_json_write_ctx *w;
free_rpc_delete_target_node(&ctx->req);
w = spdk_jsonrpc_begin_result(ctx->request);
if (w == NULL) {
goto exit;
}
spdk_json_write_bool(w, rc == 0);
spdk_jsonrpc_end_result(ctx->request, w);
exit:
free(ctx);
}
static void static void
spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request, spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_target_node req = {}; struct rpc_delete_target_node_ctx *ctx;
struct spdk_json_write_ctx *w;
ctx = calloc(1, sizeof(*ctx));
if (!ctx) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
spdk_strerror(ENOMEM));
return;
}
if (spdk_json_decode_object(params, rpc_delete_target_node_decoders, if (spdk_json_decode_object(params, rpc_delete_target_node_decoders,
SPDK_COUNTOF(rpc_delete_target_node_decoders), SPDK_COUNTOF(rpc_delete_target_node_decoders),
&req)) { &ctx->req)) {
SPDK_ERRLOG("spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
} }
if (req.name == NULL) { if (ctx->req.name == NULL) {
SPDK_ERRLOG("missing name param\n"); SPDK_ERRLOG("missing name param\n");
goto invalid; goto invalid;
} }
if (spdk_iscsi_shutdown_tgt_node_by_name(req.name)) { ctx->request = request;
if (spdk_iscsi_shutdown_tgt_node_by_name(ctx->req.name)) {
SPDK_ERRLOG("shutdown_tgt_node_by_name failed\n"); SPDK_ERRLOG("shutdown_tgt_node_by_name failed\n");
goto invalid; goto invalid;
} }
free_rpc_delete_target_node(&req); rpc_delete_target_node_done(ctx, 0);
w = spdk_jsonrpc_begin_result(request);
if (w == NULL) {
return;
}
spdk_json_write_bool(w, true);
spdk_jsonrpc_end_result(request, w);
return; return;
invalid: invalid:
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
free_rpc_delete_target_node(&req); free_rpc_delete_target_node(&ctx->req);
free(ctx);
} }
SPDK_RPC_REGISTER("delete_target_node", spdk_rpc_delete_target_node, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("delete_target_node", spdk_rpc_delete_target_node, SPDK_RPC_RUNTIME)