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

bdev/raid: add more descriptive rpc error messages

Browse Source 
Improve error messages where possible.
Unify returned error codes and messages with previous
changes done in other bdev modules.

Change-Id: Id35b61e8157fab9940e5811b71289978a6f23b05
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461591
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 13:23:30 +02:00 committed by Darek Stojaczyk
parent fa3e0a68c1
commit c6f2b30918
1 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
lib/bdev/raid/bdev_raid_rpc.c
View File

@ -98,24 +98,22 @@ spdk_rpc_get_raid_bdevs(struct spdk_jsonrpc_request *request, const struct spdk_
if (spdk_json_decode_object(params, rpc_get_raid_bdevs_decoders, if (spdk_json_decode_object(params, rpc_get_raid_bdevs_decoders,
SPDK_COUNTOF(rpc_get_raid_bdevs_decoders), SPDK_COUNTOF(rpc_get_raid_bdevs_decoders),
&req)) { &req)) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
free_rpc_get_raid_bdevs(&req); "spdk_json_decode_object failed");
return; goto cleanup;
} }
if (!(strcmp(req.category, "all") == 0 || if (!(strcmp(req.category, "all") == 0 ||
strcmp(req.category, "online") == 0 || strcmp(req.category, "online") == 0 ||
strcmp(req.category, "configuring") == 0 || strcmp(req.category, "configuring") == 0 ||
strcmp(req.category, "offline") == 0)) { strcmp(req.category, "offline") == 0)) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, -EINVAL, spdk_strerror(EINVAL));
free_rpc_get_raid_bdevs(&req); goto cleanup;
return;
} }
w = spdk_jsonrpc_begin_result(request); w = spdk_jsonrpc_begin_result(request);
if (w == NULL) { if (w == NULL) {
free_rpc_get_raid_bdevs(&req); goto cleanup;
return;
} }
spdk_json_write_array_begin(w); spdk_json_write_array_begin(w);
@ -140,6 +138,8 @@ spdk_rpc_get_raid_bdevs(struct spdk_jsonrpc_request *request, const struct spdk_
} }
spdk_json_write_array_end(w); spdk_json_write_array_end(w);
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
cleanup:
free_rpc_get_raid_bdevs(&req); free_rpc_get_raid_bdevs(&req);
} }
SPDK_RPC_REGISTER("get_raid_bdevs", spdk_rpc_get_raid_bdevs, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("get_raid_bdevs", spdk_rpc_get_raid_bdevs, SPDK_RPC_RUNTIME)
@ -235,19 +235,18 @@ spdk_rpc_construct_raid_bdev(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_construct_raid_bdev_decoders, if (spdk_json_decode_object(params, rpc_construct_raid_bdev_decoders,
SPDK_COUNTOF(rpc_construct_raid_bdev_decoders), SPDK_COUNTOF(rpc_construct_raid_bdev_decoders),
&req)) { &req)) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"Invalid parameters"); "spdk_json_decode_object failed");
goto invalid; goto cleanup;
} }
if (req.strip_size == 0 && req.strip_size_kb == 0) { if (req.strip_size == 0 && req.strip_size_kb == 0) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, EINVAL, "strip size not specified");
"strip size not specified"); goto cleanup;
goto invalid;
} else if (req.strip_size > 0 && req.strip_size_kb > 0) { } else if (req.strip_size > 0 && req.strip_size_kb > 0) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"please use only one strip size option"); "please use only one strip size option");
goto invalid; goto cleanup;
} else if (req.strip_size > 0 && req.strip_size_kb == 0) { } else if (req.strip_size > 0 && req.strip_size_kb == 0) {
SPDK_ERRLOG("the rpc param strip_size is deprecated.\n"); SPDK_ERRLOG("the rpc param strip_size is deprecated.\n");
req.strip_size_kb = req.strip_size; req.strip_size_kb = req.strip_size;
@ -257,53 +256,46 @@ spdk_rpc_construct_raid_bdev(struct spdk_jsonrpc_request *request,
req.raid_level, req.raid_level,
&raid_cfg); &raid_cfg);
if (rc != 0) { if (rc != 0) {
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response_fmt(request, rc, "Failed to add RAID bdev config %s: %s", req.name,
"Failed to add RAID bdev config %s: %s", spdk_strerror(-rc));
req.name, spdk_strerror(-rc)); goto cleanup;
goto invalid;
} }
for (size_t i = 0; i < req.base_bdevs.num_base_bdevs; i++) { for (size_t i = 0; i < req.base_bdevs.num_base_bdevs; i++) {
rc = raid_bdev_config_add_base_bdev(raid_cfg, req.base_bdevs.base_bdevs[i], i); rc = raid_bdev_config_add_base_bdev(raid_cfg, req.base_bdevs.base_bdevs[i], i);
if (rc != 0) { if (rc != 0) {
raid_bdev_config_cleanup(raid_cfg); raid_bdev_config_cleanup(raid_cfg);
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response_fmt(request, rc,
"Failed to add base bdev %s to RAID bdev config %s: %s", "Failed to add base bdev %s to RAID bdev config %s: %s", req.base_bdevs.base_bdevs[i], req.name,
req.base_bdevs.base_bdevs[i], req.name,
spdk_strerror(-rc)); spdk_strerror(-rc));
goto invalid; goto cleanup;
} }
} }
rc = raid_bdev_create(raid_cfg); rc = raid_bdev_create(raid_cfg);
if (rc != 0) { if (rc != 0) {
raid_bdev_config_cleanup(raid_cfg); raid_bdev_config_cleanup(raid_cfg);
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response_fmt(request, rc, "Failed to create RAID bdev %s: %s", req.name,
"Failed to create RAID bdev %s: %s", spdk_strerror(-rc));
req.name, spdk_strerror(-rc)); goto cleanup;
goto invalid;
} }
rc = raid_bdev_add_base_devices(raid_cfg); rc = raid_bdev_add_base_devices(raid_cfg);
if (rc != 0) { if (rc != 0) {
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response_fmt(request, rc, "Failed to add any base bdev to RAID bdev %s: %s",
"Failed to add any base bdev to RAID bdev %s: %s",
req.name, spdk_strerror(-rc)); req.name, spdk_strerror(-rc));
goto invalid; goto cleanup;
} }
free_rpc_construct_raid_bdev(&req);
w = spdk_jsonrpc_begin_result(request); w = spdk_jsonrpc_begin_result(request);
if (w == NULL) { if (w == NULL) {
return; goto cleanup;
} }
spdk_json_write_bool(w, true); spdk_json_write_bool(w, true);
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
return;
invalid: cleanup:
free_rpc_construct_raid_bdev(&req); free_rpc_construct_raid_bdev(&req);
} }
SPDK_RPC_REGISTER("construct_raid_bdev", spdk_rpc_construct_raid_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("construct_raid_bdev", spdk_rpc_construct_raid_bdev, SPDK_RPC_RUNTIME)
@ -402,24 +394,23 @@ spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request, const struct sp
ctx = calloc(1, sizeof(*ctx)); ctx = calloc(1, sizeof(*ctx));
if (!ctx) { if (!ctx) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, -ENOMEM, spdk_strerror(ENOMEM));
spdk_strerror(ENOMEM));
return; return;
} }
if (spdk_json_decode_object(params, rpc_destroy_raid_bdev_decoders, if (spdk_json_decode_object(params, rpc_destroy_raid_bdev_decoders,
SPDK_COUNTOF(rpc_destroy_raid_bdev_decoders), SPDK_COUNTOF(rpc_destroy_raid_bdev_decoders),
&ctx->req)) { &ctx->req)) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"Invalid parameters"); "spdk_json_decode_object failed");
goto invalid; goto cleanup;
} }
ctx->raid_cfg = raid_bdev_config_find_by_name(ctx->req.name); ctx->raid_cfg = raid_bdev_config_find_by_name(ctx->req.name);
if (ctx->raid_cfg == NULL) { if (ctx->raid_cfg == NULL) {
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response_fmt(request, ENODEV, "raid bdev %s is not found in config",
"raid bdev %s is not found in config", ctx->req.name); ctx->req.name);
goto invalid; goto cleanup;
} }
ctx->request = request; ctx->request = request;
@ -429,7 +420,7 @@ spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request, const struct sp
return; return;
invalid: cleanup:
free_rpc_destroy_raid_bdev(&ctx->req); free_rpc_destroy_raid_bdev(&ctx->req);
free(ctx); free(ctx);
} }