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

aio/rpc: Add more descriptive error messages for aio bdevs

Browse Source 
Improve error messages where possible

Change-Id: I104998a666789c4e724d153c2cd14ee05c71b699
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460157
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Karol Latecki 2019-07-02 16:30:41 +02:00 committed by Changpeng Liu
parent c4a1c90a4c
commit d9580c759e
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/bdev/aio/bdev_aio_rpc.c
View File

@ -68,13 +68,15 @@ spdk_rpc_construct_aio_bdev(struct spdk_jsonrpc_request *request,
SPDK_COUNTOF(rpc_construct_aio_decoders), SPDK_COUNTOF(rpc_construct_aio_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_aio_bdev(req.name, req.filename, req.block_size); rc = create_aio_bdev(req.name, req.filename, req.block_size);
if (rc) { if (rc) {
goto invalid; spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
goto cleanup;
} }
@ -86,10 +88,6 @@ spdk_rpc_construct_aio_bdev(struct spdk_jsonrpc_request *request,
spdk_json_write_string(w, req.name); spdk_json_write_string(w, req.name);
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
goto cleanup;
invalid:
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
cleanup: cleanup:
free_rpc_construct_aio(&req); free_rpc_construct_aio(&req);
} }
@ -130,19 +128,19 @@ spdk_rpc_delete_aio_bdev(struct spdk_jsonrpc_request *request,
{ {
struct rpc_delete_aio req = {NULL}; struct rpc_delete_aio req = {NULL};
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
int rc;
if (spdk_json_decode_object(params, rpc_delete_aio_decoders, if (spdk_json_decode_object(params, rpc_delete_aio_decoders,
SPDK_COUNTOF(rpc_delete_aio_decoders), SPDK_COUNTOF(rpc_delete_aio_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_aio_bdev(bdev, _spdk_rpc_delete_aio_bdev_cb, request); delete_aio_bdev(bdev, _spdk_rpc_delete_aio_bdev_cb, request);
@ -151,8 +149,7 @@ spdk_rpc_delete_aio_bdev(struct spdk_jsonrpc_request *request,
return; return;
invalid: cleanup:
free_rpc_delete_aio(&req); free_rpc_delete_aio(&req);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
} }
SPDK_RPC_REGISTER("delete_aio_bdev", spdk_rpc_delete_aio_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("delete_aio_bdev", spdk_rpc_delete_aio_bdev, SPDK_RPC_RUNTIME)