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

RPC: rename rpc get_raid_bdevs to bdev_raid_get_bdevs 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
parent c2a4f329

doc/bdev.md

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


`rpc.py construct_raid_bdev -n Raid0 -z 64 -r 0 -b "lvol0 lvol1 lvol2 lvol3"`



`rpc.py get_raid_bdevs`

`rpc.py bdev_raid_get_bdevs`



`rpc.py destroy_raid_bdev Raid0`

doc/jsonrpc.md

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


# RAID



## get_raid_bdevs {#rpc_get_raid_bdevs}

## bdev_raid_get_bdevs {#rpc_bdev_raid_get_bdevs}



This is used to list all the raid bdev names based on the input category requested. Category should be one

of 'all', 'online', 'configuring' or 'offline'. 'all' means all the raid bdevs whether they are online or
@@ -5310,7 +5310,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "get_raid_bdevs",

  "method": "bdev_raid_get_bdevs",

  "id": 1,

  "params": {

    "category": "all"

module/bdev/raid/bdev_raid_rpc.c

+15 −14
Original line number Diff line number Diff line
@@ -44,23 +44,23 @@ 
SPDK_LOG_REGISTER_COMPONENT("raidrpc", SPDK_LOG_RAID_RPC)



/*

 * Input structure for get_raid_bdevs RPC

 * Input structure for bdev_raid_get_bdevs RPC

 */

struct rpc_get_raid_bdevs {

struct rpc_bdev_raid_get_bdevs {

	/* category - all or online or configuring or offline */

	char *category;

};



/*

 * brief:

 * free_rpc_get_raids function frees RPC get_raids related parameters

 * free_rpc_bdev_raid_get_bdevs function frees RPC bdev_raid_get_bdevs related parameters

 * params:

 * req - pointer to RPC request

 * returns:

 * none

 */

static void

free_rpc_get_raid_bdevs(struct rpc_get_raid_bdevs *req)

free_rpc_bdev_raid_get_bdevs(struct rpc_bdev_raid_get_bdevs *req)

{

	free(req->category);

}
@@ -68,13 +68,13 @@ free_rpc_get_raid_bdevs(struct rpc_get_raid_bdevs *req) 
/*

 * Decoder object for RPC get_raids

 */

static const struct spdk_json_object_decoder rpc_get_raid_bdevs_decoders[] = {

	{"category", offsetof(struct rpc_get_raid_bdevs, category), spdk_json_decode_string},

static const struct spdk_json_object_decoder rpc_bdev_raid_get_bdevs_decoders[] = {

	{"category", offsetof(struct rpc_bdev_raid_get_bdevs, category), spdk_json_decode_string},

};



/*

 * brief:

 * spdk_rpc_get_raids function is the RPC for get_raids. This is used to list

 * spdk_rpc_bdev_raid_get_bdevs function is the RPC for spdk_rpc_bdev_raid_get_bdevs. This is used to list

 * all the raid bdev names based on the input category requested. Category should be

 * one of "all", "online", "configuring" or "offline". "all" means all the raids

 * whether they are online or configuring or offline. "online" is the raid bdev which
@@ -89,15 +89,15 @@ static const struct spdk_json_object_decoder rpc_get_raid_bdevs_decoders[] = { 
 * none

 */

static void

spdk_rpc_get_raid_bdevs(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_raid_get_bdevs(struct spdk_jsonrpc_request *request,

			     const struct spdk_json_val *params)

{

	struct rpc_get_raid_bdevs   req = {};

	struct rpc_bdev_raid_get_bdevs   req = {};

	struct spdk_json_write_ctx  *w;

	struct raid_bdev            *raid_bdev;



	if (spdk_json_decode_object(params, rpc_get_raid_bdevs_decoders,

				    SPDK_COUNTOF(rpc_get_raid_bdevs_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_raid_get_bdevs_decoders,

				    SPDK_COUNTOF(rpc_bdev_raid_get_bdevs_decoders),

				    &req)) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");
@@ -137,9 +137,10 @@ spdk_rpc_get_raid_bdevs(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);



cleanup:

	free_rpc_get_raid_bdevs(&req);

	free_rpc_bdev_raid_get_bdevs(&req);

}

SPDK_RPC_REGISTER("get_raid_bdevs", spdk_rpc_get_raid_bdevs, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_raid_get_bdevs", spdk_rpc_bdev_raid_get_bdevs, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_raid_get_bdevs, get_raid_bdevs)



/*

 * Base bdevs in RPC construct_raid

scripts/rpc.py

+6 −5
Original line number Diff line number Diff line
@@ -1321,17 +1321,18 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('-l', '--lvs-name', help='lvol store name', required=False)

    p.set_defaults(func=bdev_lvol_get_lvstores)



    def get_raid_bdevs(args):

        print_array(rpc.bdev.get_raid_bdevs(args.client,

    def bdev_raid_get_bdevs(args):

        print_array(rpc.bdev.bdev_raid_get_bdevs(args.client,

                                                 category=args.category))



    p = subparsers.add_parser('get_raid_bdevs', help="""This is used to list all the raid bdev names based on the input category

    p = subparsers.add_parser('bdev_raid_get_bdevs', aliases=['get_raid_bdevs'],

                              help="""This is used to list all the raid bdev names based on the input category

    requested. Category should be one of 'all', 'online', 'configuring' or 'offline'. 'all' means all the raid bdevs whether

    they are online or configuring or offline. 'online' is the raid bdev which is registered with bdev layer. 'configuring'

    is the raid bdev which does not have full configuration discovered yet. 'offline' is the raid bdev which is not registered

    with bdev as of now and it has encountered any error or user has requested to offline the raid bdev""")

    p.add_argument('category', help='all or online or configuring or offline')

    p.set_defaults(func=get_raid_bdevs)

    p.set_defaults(func=bdev_raid_get_bdevs)



    def construct_raid_bdev(args):

        base_bdevs = []

scripts/rpc/bdev.py

+3 −2
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ def bdev_null_delete(client, name): 
    return client.call('bdev_null_delete', params)





def get_raid_bdevs(client, category):

@deprecated_alias('get_raid_bdevs')

def bdev_raid_get_bdevs(client, category):

    """Get list of raid bdevs based on category



    Args:
@@ -245,7 +246,7 @@ def get_raid_bdevs(client, category): 
        List of raid bdev names

    """

    params = {'category': category}

    return client.call('get_raid_bdevs', params)

    return client.call('bdev_raid_get_bdevs', params)





def construct_raid_bdev(client, name, raid_level, base_bdevs, strip_size=None, strip_size_kb=None):