Commit 4fd967b2 authored by Maciej Szwed's avatar Maciej Szwed Committed by Jim Harris
Browse files

bdev: add delete_rbd_bdev call 



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

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: Ia87459e0cc49a0c408de582bd1f5680c570d42d9
Reviewed-on: https://review.gerrithub.io/416529


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 2ce9836b

lib/bdev/rbd/bdev_rbd.c

+11 −0
Original line number Diff line number Diff line
@@ -656,6 +656,17 @@ spdk_bdev_rbd_create(const char *name, const char *pool_name, const char *rbd_na 
	return &rbd->disk;

}



void

spdk_bdev_rbd_delete(struct spdk_bdev *bdev, spdk_delete_rbd_complete cb_fn, void *cb_arg)

{

	if (!bdev || bdev->module != &rbd_if) {

		cb_fn(cb_arg, -ENODEV);

		return;

	}



	spdk_bdev_unregister(bdev, cb_fn, cb_arg);

}



static int

bdev_rbd_library_init(void)

{

lib/bdev/rbd/bdev_rbd.h

+11 −0
Original line number Diff line number Diff line
@@ -38,7 +38,18 @@ 


#include "spdk/bdev.h"



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



struct spdk_bdev *spdk_bdev_rbd_create(const char *name, const char *pool_name,

				       const char *rbd_name, uint32_t block_size);

/**

 * Delete rbd bdev.

 *

 * \param bdev Pointer to rbd bdev.

 * \param cb_fn Function to call after deletion.

 * \param cb_arg Argument to pass to cb_fn.

 */

void spdk_bdev_rbd_delete(struct spdk_bdev *bdev, spdk_delete_rbd_complete cb_fn,

			  void *cb_arg);



#endif // SPDK_BDEV_RBD_H

lib/bdev/rbd/bdev_rbd_rpc.c

+61 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "bdev_rbd.h"

#include "spdk/rpc.h"

#include "spdk/util.h"



#include "spdk/string.h"

#include "spdk_internal/log.h"



struct rpc_construct_rbd {
@@ -95,3 +95,63 @@ invalid: 
	free_rpc_construct_rbd(&req);

}

SPDK_RPC_REGISTER("construct_rbd_bdev", spdk_rpc_construct_rbd_bdev, SPDK_RPC_RUNTIME)



struct rpc_delete_rbd {

	char *name;

};



static void

free_rpc_delete_rbd(struct rpc_delete_rbd *req)

{

	free(req->name);

}



static const struct spdk_json_object_decoder rpc_delete_rbd_decoders[] = {

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

};



static void

_spdk_rpc_delete_rbd_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_rbd_bdev(struct spdk_jsonrpc_request *request,

			 const struct spdk_json_val *params)

{

	struct rpc_delete_rbd req = {NULL};

	struct spdk_bdev *bdev;

	int rc;



	if (spdk_json_decode_object(params, rpc_delete_rbd_decoders,

				    SPDK_COUNTOF(rpc_delete_rbd_decoders),

				    &req)) {

		rc = -EINVAL;

		goto invalid;

	}



	bdev = spdk_bdev_get_by_name(req.name);

	if (bdev == NULL) {

		rc = -ENODEV;

		goto invalid;

	}



	spdk_bdev_rbd_delete(bdev, _spdk_rpc_delete_rbd_bdev_cb, request);

	free_rpc_delete_rbd(&req);

	return;



invalid:

	free_rpc_delete_rbd(&req);

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

}

SPDK_RPC_REGISTER("delete_rbd_bdev", spdk_rpc_delete_rbd_bdev, SPDK_RPC_RUNTIME)

scripts/rpc.py

+9 −0
Original line number Diff line number Diff line
@@ -250,6 +250,15 @@ if __name__ == "__main__": 
    p.add_argument('block_size', help='rbd block size', type=int)

    p.set_defaults(func=construct_rbd_bdev)



    @call_cmd

    def delete_rbd_bdev(args):

        rpc.bdev.delete_rbd_bdev(args.client,

                                 name=args.name)



    p = subparsers.add_parser('delete_rbd_bdev', help='Delete a rbd bdev')

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

    p.set_defaults(func=delete_rbd_bdev)



    @call_cmd

    def construct_error_bdev(args):

        print(rpc.bdev.construct_error_bdev(args.client,

scripts/rpc/bdev.py

+10 −0
Original line number Diff line number Diff line
@@ -158,6 +158,16 @@ def construct_rbd_bdev(client, pool_name, rbd_name, block_size, name=None): 
    return client.call('construct_rbd_bdev', params)





def delete_rbd_bdev(client, name):

    """Remove rbd bdev from the system.



    Args:

        name: name of rbd bdev to delete

    """

    params = {'name': name}

    return client.call('delete_rbd_bdev', params)





def construct_error_bdev(client, base_name):

    """Construct an error injection block device.