Commit 0847ad90 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

bdev: add delete_error_bdev call 



Since delete_bdev should be used only for debug purpose,
this patch adds delete call specific for error injection bdev.

Changes in tests and spdkcli done accordingly.

Change-Id: I7f0be09cfed582c4d1060871e40c41eff5af7129
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/415502


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 9539edca

lib/bdev/error/vbdev_error.c

+11 −0
Original line number Diff line number Diff line
@@ -341,6 +341,17 @@ spdk_vbdev_error_create(const char *base_bdev_name) 
	return rc;

}



void

spdk_vbdev_error_delete(struct spdk_bdev *vbdev, spdk_delete_error_complete cb_fn, void *cb_arg)

{

	if (!vbdev || vbdev->module != &error_if) {

		cb_fn(cb_arg, -ENODEV);

		return;

	}



	spdk_bdev_unregister(vbdev, cb_fn, cb_arg);

}



static void

vbdev_error_clear_config(void)

{

lib/bdev/error/vbdev_error.h

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ enum vbdev_error_type { 
	VBDEV_IO_PENDING,

};



typedef void (*spdk_delete_error_complete)(void *cb_arg, int bdeverrno);



/**

 * Create a vbdev on the base bdev to inject error into it.

 *
@@ -50,6 +52,16 @@ enum vbdev_error_type { 
 */

int spdk_vbdev_error_create(const char *base_bdev_name);



/**

 * Delete vbdev used to inject errors.

 *

 * \param bdev Pointer to error vbdev.

 * \param cb_fn Function to call after deletion.

 * \param cb_arg Arguments to pass to cb_fn.

 */

void spdk_vbdev_error_delete(struct spdk_bdev *vbdev, spdk_delete_error_complete cb_fn,

			     void *cb_arg);



/**

 * Inject error to the base bdev. Users can specify which IO type error is injected,

 * what type of error is injected, and how many errors are injected.

lib/bdev/error/vbdev_error_rpc.c

+63 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "spdk/string.h"

#include "spdk/rpc.h"

#include "spdk/util.h"



#include "spdk/string.h"

#include "spdk_internal/log.h"

#include "vbdev_error.h"
@@ -124,6 +124,68 @@ invalid: 
}

SPDK_RPC_REGISTER("construct_error_bdev", spdk_rpc_construct_error_bdev, SPDK_RPC_RUNTIME)



struct rpc_delete_error {

	char *name;

};



static void

free_rpc_delete_error(struct rpc_delete_error *r)

{

	free(r->name);

}



static const struct spdk_json_object_decoder rpc_delete_error_decoders[] = {

	{"name", offsetof(struct rpc_delete_error, name), spdk_json_decode_string},

};



static void

_spdk_rpc_delete_error_bdev_cb(void *cb_arg, int bdeverrno)

{

	struct spdk_jsonrpc_request *request = cb_arg;

	struct spdk_json_write_ctx *w;



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_bool(w, bdeverrno == 0);

	spdk_jsonrpc_end_result(request, w);

}



static void

spdk_rpc_delete_error_bdev(struct spdk_jsonrpc_request *request,

			   const struct spdk_json_val *params)

{

	struct rpc_delete_error req = {NULL};

	struct spdk_bdev *vbdev;

	int rc;



	if (spdk_json_decode_object(params, rpc_delete_error_decoders,

				    SPDK_COUNTOF(rpc_delete_error_decoders),

				    &req)) {

		rc = -EINVAL;

		goto invalid;

	}



	vbdev = spdk_bdev_get_by_name(req.name);

	if (vbdev == NULL) {

		rc = -ENODEV;

		goto invalid;

	}



	spdk_vbdev_error_delete(vbdev, _spdk_rpc_delete_error_bdev_cb, request);



	free_rpc_delete_error(&req);



	return;



invalid:

	free_rpc_delete_error(&req);

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

}

SPDK_RPC_REGISTER("delete_error_bdev", spdk_rpc_delete_error_bdev, SPDK_RPC_RUNTIME)



struct rpc_error_information {

	char *name;

	char *io_type;

scripts/rpc.py

+9 −0
Original line number Diff line number Diff line
@@ -239,6 +239,15 @@ if __name__ == "__main__": 
    p.add_argument('base_name', help='base bdev name')

    p.set_defaults(func=construct_error_bdev)



    @call_cmd

    def delete_error_bdev(args):

        rpc.bdev.delete_error_bdev(args.client,

                                   name=args.name)



    p = subparsers.add_parser('delete_error_bdev', help='Delete an error bdev')

    p.add_argument('name', help='error bdev name')

    p.set_defaults(func=delete_error_bdev)



    @call_cmd

    def construct_iscsi_bdev(args):

        rpc.bdev.construct_iscsi_bdev(args.client,

scripts/rpc/bdev.py

+10 −0
Original line number Diff line number Diff line
@@ -158,6 +158,16 @@ def construct_error_bdev(client, base_name): 
    return client.call('construct_error_bdev', params)





def delete_error_bdev(client, name):

    """Remove error bdev from the system.



    Args:

        bdev_name: name of error bdev to delete

    """

    params = {'name': name}

    return client.call('delete_error_bdev', params)





def construct_iscsi_bdev(client, name, url, initiator_iqn):

    """Construct a iSCSI block device.