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

bdev/compress: add more descriptive rpc error messages

Browse Source 
Improve error messages where possible.
Modify parts of the code so that it follows the same pattern
as in previousle changed bdev modules.

Change-Id: I6672a14900326029c670bfca99a6d085093861c3
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461553
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 09:39:37 +02:00 committed by Darek Stojaczyk
parent 695ecf48bf
commit 2805cad12f
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/bdev/compress/vbdev_compress_rpc.c
View File

@ -51,28 +51,27 @@ spdk_rpc_set_compress_pmd(struct spdk_jsonrpc_request *request,
{
struct rpc_set_compress_pmd req;
struct spdk_json_write_ctx *w;
int rc, jerr = 0;
int rc = 0;
if (spdk_json_decode_object(params, rpc_compress_pmd_decoder,
SPDK_COUNTOF(rpc_compress_pmd_decoder),
&req)) {
SPDK_ERRLOG("spdk_json_decode_object failed\n");
rc = -EINVAL;
jerr = SPDK_JSONRPC_ERROR_PARSE_ERROR;
goto invalid;
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed");
return;
}
if (req.pmd >= COMPRESS_PMD_MAX) {
rc = -EINVAL;
jerr = SPDK_JSONRPC_ERROR_INVALID_PARAMS;
goto invalid;
spdk_jsonrpc_send_error_response_fmt(request, -EINVAL,
"PMD value %d should be less than %d", req.pmd, COMPRESS_PMD_MAX);
return;
}
rc = set_compress_pmd(&req.pmd);
if (rc) {
rc = -EINVAL;
jerr = SPDK_JSONRPC_ERROR_INTERNAL_ERROR;
goto invalid;
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
return;
}
w = spdk_jsonrpc_begin_result(request);
@ -80,10 +79,6 @@ spdk_rpc_set_compress_pmd(struct spdk_jsonrpc_request *request,
spdk_json_write_bool(w, true);
spdk_jsonrpc_end_result(request, w);
}
return;
invalid:
spdk_jsonrpc_send_error_response(request, jerr, spdk_strerror(-rc));
}
SPDK_RPC_REGISTER("set_compress_pmd", spdk_rpc_set_compress_pmd, SPDK_RPC_RUNTIME)
@ -123,12 +118,15 @@ spdk_rpc_construct_compress_bdev(struct spdk_jsonrpc_request *request,
SPDK_COUNTOF(rpc_construct_compress_decoders),
&req)) {
SPDK_DEBUGLOG(SPDK_LOG_VBDEV_COMPRESS, "spdk_json_decode_object failed\n");
goto invalid;
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed");
goto cleanup;
}
rc = create_compress_bdev(req.base_bdev_name, req.pm_path);
if (rc != 0) {
goto invalid;
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
goto cleanup;
}
w = spdk_jsonrpc_begin_result(request);
@ -140,13 +138,10 @@ spdk_rpc_construct_compress_bdev(struct spdk_jsonrpc_request *request,
name = spdk_sprintf_alloc("COMP_%s", req.base_bdev_name);
spdk_json_write_string(w, name);
spdk_jsonrpc_end_result(request, w);
free_rpc_construct_compress(&req);
free(name);
return;
invalid:
cleanup:
free_rpc_construct_compress(&req);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
}
SPDK_RPC_REGISTER("construct_compress_bdev", spdk_rpc_construct_compress_bdev, SPDK_RPC_RUNTIME)
@ -185,29 +180,24 @@ spdk_rpc_delete_compress_bdev(struct spdk_jsonrpc_request *request,
{
struct rpc_delete_compress req = {NULL};
struct spdk_bdev *bdev;
int rc;
if (spdk_json_decode_object(params, rpc_delete_compress_decoders,
SPDK_COUNTOF(rpc_delete_compress_decoders),
&req)) {
rc = -EINVAL;
goto invalid;
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed");
goto cleanup;
}
bdev = spdk_bdev_get_by_name(req.name);
if (bdev == NULL) {
rc = -ENODEV;
goto invalid;
spdk_jsonrpc_send_error_response(request, ENODEV, spdk_strerror(-ENODEV));
goto cleanup;
}
delete_compress_bdev(bdev, _spdk_rpc_delete_compress_bdev_cb, request);
cleanup:
free_rpc_delete_compress(&req);
return;
invalid:
free_rpc_delete_compress(&req);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
}
SPDK_RPC_REGISTER("delete_compress_bdev", spdk_rpc_delete_compress_bdev, SPDK_RPC_RUNTIME)