Commit 27d8ca2c authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename rpc destroy_raid_bdev to bdev_raid_delete 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Iabe1df302f9960919d7e8d77f8beb4d64a29ad6e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467919


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f0731534

doc/bdev.md

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ Example commands 


`rpc.py bdev_raid_get_bdevs`



`rpc.py destroy_raid_bdev Raid0`

`rpc.py bdev_raid_delete Raid0`



# Passthru {#bdev_config_passthru}

doc/jsonrpc.md

+2 −2
Original line number Diff line number Diff line
@@ -5377,7 +5377,7 @@ Example response: 
}

~~~



## destroy_raid_bdev {#rpc_destroy_raid_bdev}

## bdev_raid_delete {#rpc_bdev_raid_delete}



Removes RAID bdev.
@@ -5394,7 +5394,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "destroy_raid_bdev",

  "method": "bdev_raid_delete",

  "id": 1,

  "params": {

    "name": "Raid0"

module/bdev/raid/bdev_raid_rpc.c

+26 −25
Original line number Diff line number Diff line
@@ -300,36 +300,36 @@ SPDK_RPC_REGISTER("bdev_raid_create", spdk_rpc_bdev_raid_create, SPDK_RPC_RUNTIM 
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_raid_create, construct_raid_bdev)



/*

 * Input structure for RPC destroy_raid

 * Input structure for RPC deleting a raid bdev

 */

struct rpc_destroy_raid_bdev {

struct rpc_bdev_raid_delete {

	/* raid bdev name */

	char *name;

};



/*

 * brief:

 * free_rpc_destroy_raid_bdev function is used to free RPC destroy_raid_bdev related parameters

 * free_rpc_bdev_raid_delete function is used to free RPC bdev_raid_delete related parameters

 * params:

 * req - pointer to RPC request

 * params:

 * none

 */

static void

free_rpc_destroy_raid_bdev(struct rpc_destroy_raid_bdev *req)

free_rpc_bdev_raid_delete(struct rpc_bdev_raid_delete *req)

{

	free(req->name);

}



/*

 * Decoder object for RPC destroy_raid

 * Decoder object for RPC raid_bdev_delete

 */

static const struct spdk_json_object_decoder rpc_destroy_raid_bdev_decoders[] = {

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

static const struct spdk_json_object_decoder rpc_bdev_raid_delete_decoders[] = {

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

};



struct rpc_destroy_raid_bdev_ctx {

	struct rpc_destroy_raid_bdev req;

struct rpc_bdev_raid_delete_ctx {

	struct rpc_bdev_raid_delete req;

	struct raid_bdev_config *raid_cfg;

	struct spdk_jsonrpc_request *request;

};
@@ -338,20 +338,20 @@ struct rpc_destroy_raid_bdev_ctx { 
 * brief:

 * params:

 * cb_arg - pointer to the callback context.

 * rc - return code of the destruction of the raid bdev.

 * rc - return code of the deletion of the raid bdev.

 * returns:

 * none

 */

static void

destroy_raid_bdev_done(void *cb_arg, int rc)

bdev_raid_delete_done(void *cb_arg, int rc)

{

	struct rpc_destroy_raid_bdev_ctx *ctx = cb_arg;

	struct rpc_bdev_raid_delete_ctx *ctx = cb_arg;

	struct raid_bdev_config *raid_cfg;

	struct spdk_jsonrpc_request *request = ctx->request;

	struct spdk_json_write_ctx *w;



	if (rc != 0) {

		SPDK_ERRLOG("Failed to destroy raid bdev %s (%d): %s\n",

		SPDK_ERRLOG("Failed to delete raid bdev %s (%d): %s\n",

			    ctx->req.name, rc, spdk_strerror(-rc));

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 spdk_strerror(-rc));
@@ -367,14 +367,14 @@ destroy_raid_bdev_done(void *cb_arg, int rc) 
	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

exit:

	free_rpc_destroy_raid_bdev(&ctx->req);

	free_rpc_bdev_raid_delete(&ctx->req);

	free(ctx);

}



/*

 * brief:

 * spdk_rpc_destroy_raid_bdev function is the RPC for destroy_raid. It takes raid

 * name as input and destroy that raid bdev including freeing the base bdev

 * spdk_rpc_bdev_raid_delete function is the RPC for deleting a raid bdev. It takes raid

 * name as input and delete that raid bdev including freeing the base bdev

 * resources.

 * params:

 * requuest - pointer to json rpc request
@@ -383,10 +383,10 @@ exit: 
 * none

 */

static void

spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_raid_delete(struct spdk_jsonrpc_request *request,

			  const struct spdk_json_val *params)

{

	struct rpc_destroy_raid_bdev_ctx *ctx;

	struct rpc_bdev_raid_delete_ctx *ctx;



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

	if (!ctx) {
@@ -394,8 +394,8 @@ spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request, 
		return;

	}



	if (spdk_json_decode_object(params, rpc_destroy_raid_bdev_decoders,

				    SPDK_COUNTOF(rpc_destroy_raid_bdev_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_raid_delete_decoders,

				    SPDK_COUNTOF(rpc_bdev_raid_delete_decoders),

				    &ctx->req)) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");
@@ -412,13 +412,14 @@ spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request, 


	ctx->request = request;



	/* Remove all the base bdevs from this raid bdev before destroying the raid bdev */

	raid_bdev_remove_base_devices(ctx->raid_cfg, destroy_raid_bdev_done, ctx);

	/* Remove all the base bdevs from this raid bdev before deleting the raid bdev */

	raid_bdev_remove_base_devices(ctx->raid_cfg, bdev_raid_delete_done, ctx);



	return;



cleanup:

	free_rpc_destroy_raid_bdev(&ctx->req);

	free_rpc_bdev_raid_delete(&ctx->req);

	free(ctx);

}

SPDK_RPC_REGISTER("destroy_raid_bdev", spdk_rpc_destroy_raid_bdev, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_raid_delete", spdk_rpc_bdev_raid_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_raid_delete, destroy_raid_bdev)

scripts/rpc.py

+6 −5
Original line number Diff line number Diff line
@@ -1354,12 +1354,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('-b', '--base-bdevs', help='base bdevs name, whitespace separated list in quotes', required=True)

    p.set_defaults(func=bdev_raid_create)



    def destroy_raid_bdev(args):

        rpc.bdev.destroy_raid_bdev(args.client,

    def bdev_raid_delete(args):

        rpc.bdev.bdev_raid_delete(args.client,

                                  name=args.name)

    p = subparsers.add_parser('destroy_raid_bdev', help='Destroy existing raid bdev')

    p = subparsers.add_parser('bdev_raid_delete', aliases=['destroy_raid_bdev'],

                              help='Delete existing raid bdev')

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

    p.set_defaults(func=destroy_raid_bdev)

    p.set_defaults(func=bdev_raid_delete)



    # split

    def bdev_split_create(args):

scripts/rpc/bdev.py

+4 −3
Original line number Diff line number Diff line
@@ -274,8 +274,9 @@ def bdev_raid_create(client, name, raid_level, base_bdevs, strip_size=None, stri 
    return client.call('bdev_raid_create', params)





def destroy_raid_bdev(client, name):

    """Destroy raid bdev

@deprecated_alias('destroy_raid_bdev')

def bdev_raid_delete(client, name):

    """Delete raid bdev



    Args:

        name: raid bdev name
@@ -284,7 +285,7 @@ def destroy_raid_bdev(client, name): 
        None

    """

    params = {'name': name}

    return client.call('destroy_raid_bdev', params)

    return client.call('bdev_raid_delete', params)





@deprecated_alias('construct_aio_bdev')