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

bdev/iscsi: add more descriptive rpc error messages

Browse Source 
Improve error messages where possible.

Change-Id: If08bad9f4fc88b51403b89c3f5bfc8894ef4300a
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461567
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Karol Latecki 2019-07-12 11:00:34 +02:00 committed by Darek Stojaczyk
parent c6f2b30918
commit 955518d6fc
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/bdev/iscsi/bdev_iscsi_rpc.c
View File

@ -92,21 +92,18 @@ spdk_rpc_construct_iscsi_bdev(struct spdk_jsonrpc_request *request,
SPDK_COUNTOF(rpc_construct_iscsi_bdev_decoders), SPDK_COUNTOF(rpc_construct_iscsi_bdev_decoders),
&req)) { &req)) {
SPDK_ERRLOG("spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
rc = -EINVAL; spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
goto invalid; "spdk_json_decode_object failed");
goto cleanup;
} }
rc = create_iscsi_disk(req.name, req.url, req.initiator_iqn, construct_iscsi_bdev_cb, request); rc = create_iscsi_disk(req.name, req.url, req.initiator_iqn, construct_iscsi_bdev_cb, request);
if (rc) { if (rc) {
goto invalid; spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
} }
cleanup:
free_rpc_construct_iscsi_bdev(&req); free_rpc_construct_iscsi_bdev(&req);
return;
invalid:
free_rpc_construct_iscsi_bdev(&req);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
} }
SPDK_RPC_REGISTER("construct_iscsi_bdev", spdk_rpc_construct_iscsi_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("construct_iscsi_bdev", spdk_rpc_construct_iscsi_bdev, SPDK_RPC_RUNTIME)
@ -145,29 +142,24 @@ spdk_rpc_delete_iscsi_bdev(struct spdk_jsonrpc_request *request,
{ {
struct rpc_delete_iscsi req = {NULL}; struct rpc_delete_iscsi req = {NULL};
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
int rc;
if (spdk_json_decode_object(params, rpc_delete_iscsi_decoders, if (spdk_json_decode_object(params, rpc_delete_iscsi_decoders,
SPDK_COUNTOF(rpc_delete_iscsi_decoders), SPDK_COUNTOF(rpc_delete_iscsi_decoders),
&req)) { &req)) {
rc = -EINVAL; spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
goto invalid; "spdk_json_decode_object failed");
goto cleanup;
} }
bdev = spdk_bdev_get_by_name(req.name); bdev = spdk_bdev_get_by_name(req.name);
if (bdev == NULL) { if (bdev == NULL) {
rc = -ENODEV; spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));
goto invalid; goto cleanup;
} }
delete_iscsi_disk(bdev, _spdk_rpc_delete_iscsi_bdev_cb, request); delete_iscsi_disk(bdev, _spdk_rpc_delete_iscsi_bdev_cb, request);
cleanup:
free_rpc_delete_iscsi(&req); free_rpc_delete_iscsi(&req);
return;
invalid:
free_rpc_delete_iscsi(&req);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
} }
SPDK_RPC_REGISTER("delete_iscsi_bdev", spdk_rpc_delete_iscsi_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("delete_iscsi_bdev", spdk_rpc_delete_iscsi_bdev, SPDK_RPC_RUNTIME)