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

bdev/delay: update rpc error messages

Browse Source 
Consolidate rpc error handling with previous bdev rpc
changes.

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

35
lib/bdev/delay/vbdev_delay_rpc.c
View File

@ -75,30 +75,28 @@ spdk_rpc_bdev_delay_create(struct spdk_jsonrpc_request *request,
SPDK_COUNTOF(rpc_construct_delay_decoders), SPDK_COUNTOF(rpc_construct_delay_decoders),
&req)) { &req)) {
SPDK_DEBUGLOG(SPDK_LOG_VBDEV_DELAY, "spdk_json_decode_object failed\n"); SPDK_DEBUGLOG(SPDK_LOG_VBDEV_DELAY, "spdk_json_decode_object failed\n");
free_rpc_construct_delay(&req); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); "spdk_json_decode_object failed");
return; goto cleanup;
} }
rc = create_delay_disk(req.base_bdev_name, req.name, req.avg_read_latency, req.p99_read_latency, rc = create_delay_disk(req.base_bdev_name, req.name, req.avg_read_latency, req.p99_read_latency,
req.avg_write_latency, req.p99_write_latency); req.avg_write_latency, req.p99_write_latency);
if (rc != 0) { if (rc != 0) {
free_rpc_construct_delay(&req); spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, goto cleanup;
"Failed to create delay_disk");
return;
} }
w = spdk_jsonrpc_begin_result(request); w = spdk_jsonrpc_begin_result(request);
if (w == NULL) { if (w == NULL) {
free_rpc_construct_delay(&req); goto cleanup;
return;
} }
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);
cleanup:
free_rpc_construct_delay(&req); free_rpc_construct_delay(&req);
return;
} }
SPDK_RPC_REGISTER("bdev_delay_create", spdk_rpc_bdev_delay_create, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_delay_create", spdk_rpc_bdev_delay_create, SPDK_RPC_RUNTIME)
@ -137,29 +135,24 @@ spdk_rpc_bdev_delay_delete(struct spdk_jsonrpc_request *request,
{ {
struct rpc_delete_delay req = {NULL}; struct rpc_delete_delay req = {NULL};
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
int rc;
if (spdk_json_decode_object(params, rpc_delete_delay_decoders, if (spdk_json_decode_object(params, rpc_delete_delay_decoders,
SPDK_COUNTOF(rpc_delete_delay_decoders), SPDK_COUNTOF(rpc_delete_delay_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_delay_disk(bdev, _spdk_rpc_bdev_delay_delete_cb, request); delete_delay_disk(bdev, _spdk_rpc_bdev_delay_delete_cb, request);
cleanup:
free_rpc_delete_delay(&req); free_rpc_delete_delay(&req);
return;
invalid:
free_rpc_delete_delay(&req);
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
} }
SPDK_RPC_REGISTER("bdev_delay_delete", spdk_rpc_bdev_delay_delete, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_delay_delete", spdk_rpc_bdev_delay_delete, SPDK_RPC_RUNTIME)