Commit fd4d7fcb authored by Karol Latecki's avatar Karol Latecki Committed by Darek Stojaczyk
Browse files

bdev/passthru: add more descriptive rpc error messages 



Improve error messages where possible.

Change-Id: I778b4b49c1e54c0da77f6da7906df91d8aa95f9b
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461587


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent c05355db

lib/bdev/passthru/vbdev_passthru_rpc.c

+13 −19
Original line number Diff line number Diff line
@@ -72,28 +72,27 @@ spdk_rpc_construct_passthru_bdev(struct spdk_jsonrpc_request *request, 
				    SPDK_COUNTOF(rpc_construct_passthru_decoders),

				    &req)) {

		SPDK_DEBUGLOG(SPDK_LOG_VBDEV_PASSTHRU, "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_passthru_disk(req.base_bdev_name, req.name);

	if (rc != 0) {

		goto invalid;

		spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));

		goto cleanup;

	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		free_rpc_construct_passthru(&req);

		return;

		goto cleanup;

	}



	spdk_json_write_string(w, req.name);

	spdk_jsonrpc_end_result(request, w);

	free_rpc_construct_passthru(&req);

	return;



invalid:

cleanup:

	free_rpc_construct_passthru(&req);

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");

}

SPDK_RPC_REGISTER("construct_passthru_bdev", spdk_rpc_construct_passthru_bdev, SPDK_RPC_RUNTIME)
@@ -132,29 +131,24 @@ spdk_rpc_delete_passthru_bdev(struct spdk_jsonrpc_request *request, 
{

	struct rpc_delete_passthru req = {NULL};

	struct spdk_bdev *bdev;

	int rc;



	if (spdk_json_decode_object(params, rpc_delete_passthru_decoders,

				    SPDK_COUNTOF(rpc_delete_passthru_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_passthru_disk(bdev, _spdk_rpc_delete_passthru_bdev_cb, request);



cleanup:

	free_rpc_delete_passthru(&req);



	return;



invalid:

	free_rpc_delete_passthru(&req);

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));

}

SPDK_RPC_REGISTER("delete_passthru_bdev", spdk_rpc_delete_passthru_bdev, SPDK_RPC_RUNTIME)