Commit 0fc5acea authored by Karol Latecki's avatar Karol Latecki Committed by Ben Walker
Browse files

bdev/nvme: add more descriptive rpc error messages 



Improve error messages where possible.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 438d1bee

lib/bdev/nvme/bdev_nvme.c

+3 −3
Original line number Diff line number Diff line
@@ -1262,12 +1262,12 @@ spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid, 


	if (nvme_bdev_ctrlr_get(trid) != NULL) {

		SPDK_ERRLOG("A controller with the provided trid (traddr: %s) already exists.\n", trid->traddr);

		return -1;

		return -EEXIST;

	}



	if (nvme_bdev_ctrlr_get_by_name(base_name)) {

		SPDK_ERRLOG("A controller with the provided name (%s) already exists.\n", base_name);

		return -1;

		return -EEXIST;

	}



	if (trid->trtype == SPDK_NVME_TRANSPORT_PCIE) {
@@ -1310,7 +1310,7 @@ spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid, 
	if (ctx->probe_ctx == NULL) {

		SPDK_ERRLOG("No controller was found with provided trid (traddr: %s)\n", trid->traddr);

		free(ctx);

		return -1;

		return -ENODEV;

	}

	ctx->poller = spdk_poller_register(bdev_nvme_async_poll, ctx, 1000);

lib/bdev/nvme/bdev_nvme_rpc.c

+33 −31
Original line number Diff line number Diff line
@@ -90,13 +90,15 @@ spdk_rpc_set_bdev_nvme_options(struct spdk_jsonrpc_request *request, 
					      SPDK_COUNTOF(rpc_bdev_nvme_options_decoders),

					      &opts)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		rc = -EINVAL;

		goto invalid;

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");

		return;

	}



	rc = spdk_bdev_nvme_set_opts(&opts);

	if (rc) {

		goto invalid;

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

		return;

	}



	w = spdk_jsonrpc_begin_result(request);
@@ -104,8 +106,6 @@ spdk_rpc_set_bdev_nvme_options(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);



	return;

invalid:

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

}

SPDK_RPC_REGISTER("set_bdev_nvme_options", spdk_rpc_set_bdev_nvme_options, SPDK_RPC_STARTUP)
@@ -250,7 +250,7 @@ spdk_rpc_construct_nvme_bdev(struct spdk_jsonrpc_request *request, 


	ctx = calloc(1, sizeof(*ctx));

	if (!ctx) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_strerror(ENOMEM));

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

		return;

	}
@@ -258,14 +258,18 @@ spdk_rpc_construct_nvme_bdev(struct spdk_jsonrpc_request *request, 
				    SPDK_COUNTOF(rpc_construct_nvme_decoders),

				    &ctx->req)) {

		SPDK_ERRLOG("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;

	}



	/* Parse trtype */

	rc = spdk_nvme_transport_id_parse_trtype(&trid.trtype, ctx->req.trtype);

	if (rc < 0) {

		SPDK_ERRLOG("Failed to parse trtype: %s\n", ctx->req.trtype);

		goto invalid;

		spdk_jsonrpc_send_error_response_fmt(request, -EINVAL, "Failed to parse trtype: %s",

						     ctx->req.trtype);

		goto cleanup;

	}



	/* Parse traddr */
@@ -276,7 +280,9 @@ spdk_rpc_construct_nvme_bdev(struct spdk_jsonrpc_request *request, 
		rc = spdk_nvme_transport_id_parse_adrfam(&trid.adrfam, ctx->req.adrfam);

		if (rc < 0) {

			SPDK_ERRLOG("Failed to parse adrfam: %s\n", ctx->req.adrfam);

			goto invalid;

			spdk_jsonrpc_send_error_response_fmt(request, -EINVAL, "Failed to parse adrfam: %s",

							     ctx->req.adrfam);

			goto cleanup;

		}

	}
@@ -308,15 +314,16 @@ spdk_rpc_construct_nvme_bdev(struct spdk_jsonrpc_request *request, 


	ctx->request = request;

	ctx->count = NVME_MAX_BDEVS_PER_RPC;

	if (spdk_bdev_nvme_create(&trid, &hostid, ctx->req.name, ctx->names, &ctx->count, ctx->req.hostnqn,

				  prchk_flags, spdk_rpc_construct_nvme_bdev_done, ctx)) {

		goto invalid;

	rc = spdk_bdev_nvme_create(&trid, &hostid, ctx->req.name, ctx->names, &ctx->count, ctx->req.hostnqn,

				   prchk_flags, spdk_rpc_construct_nvme_bdev_done, ctx);

	if (rc) {

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

		goto cleanup;

	}



	return;



invalid:

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

cleanup:

	free_rpc_construct_nvme(&ctx->req);

	free(ctx);

}
@@ -366,18 +373,20 @@ spdk_rpc_get_nvme_controllers(struct spdk_jsonrpc_request *request, 
					      SPDK_COUNTOF(rpc_get_nvme_controllers_decoders),

					      &req)) {

		SPDK_ERRLOG("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;

	}



	if (req.name) {

		ctrlr = nvme_bdev_ctrlr_get_by_name(req.name);

		if (ctrlr == NULL) {

			SPDK_ERRLOG("ctrlr '%s' does not exist\n", req.name);

			goto invalid;

			spdk_jsonrpc_send_error_response_fmt(request, EINVAL, "Controller %s does not exist", req.name);

			goto cleanup;

		}

	}



	free_rpc_get_nvme_controllers(&req);

	w = spdk_jsonrpc_begin_result(request);

	spdk_json_write_array_begin(w);
@@ -393,11 +402,7 @@ spdk_rpc_get_nvme_controllers(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);



	return;



invalid:

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



cleanup:

	free_rpc_get_nvme_controllers(&req);

}

SPDK_RPC_REGISTER("get_nvme_controllers", spdk_rpc_get_nvme_controllers, SPDK_RPC_RUNTIME)
@@ -427,25 +432,22 @@ spdk_rpc_delete_nvme_controller(struct spdk_jsonrpc_request *request, 
	if (spdk_json_decode_object(params, rpc_delete_nvme_decoders,

				    SPDK_COUNTOF(rpc_delete_nvme_decoders),

				    &req)) {

		rc = -EINVAL;

		goto invalid;

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");

		goto cleanup;

	}



	rc = spdk_bdev_nvme_delete(req.name);

	if (rc != 0) {

		goto invalid;

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

		goto cleanup;

	}



	free_rpc_delete_nvme(&req);



	w = spdk_jsonrpc_begin_result(request);

	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

	return;



invalid:

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

					 spdk_strerror(-rc));

cleanup:

	free_rpc_delete_nvme(&req);

}

SPDK_RPC_REGISTER("delete_nvme_controller", spdk_rpc_delete_nvme_controller, SPDK_RPC_RUNTIME)