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

RPC: rename rpc resize_lvol_bdev to bdev_lvol_resize 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent b7ad0bd0

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ Example response: 
    "construct_ftl_bdev",

    "bdev_lvol_get_lvstores",

    "destroy_lvol_bdev",

    "resize_lvol_bdev",

    "bdev_lvol_resize",

    "bdev_lvol_set_read_only",

    "decouple_parent_lvol_bdev",

    "inflate_lvol_bdev",
@@ -5108,7 +5108,7 @@ Example response: 
}

~~~



## resize_lvol_bdev {#rpc_resize_lvol_bdev}

## bdev_lvol_resize {#rpc_bdev_lvol_resize}



Resize a logical volume.
@@ -5126,7 +5126,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "resize_lvol_bdev",

  "method": "bdev_lvol_resize",

  "id": 1,

  "params": {

    "name": "51638754-ca16-43a7-9f8f-294a0805ab0a",

doc/lvol.md

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ bdev_lvol_rename [-h] old_name new_name 
    Change lvol bdev name

    optional arguments:

    -h, --help  show help

resize_lvol_bdev [-h] name size

bdev_lvol_resize [-h] name size

    Resize existing lvol bdev

    optional arguments:

    -h, --help  show help

module/bdev/lvol/vbdev_lvol_rpc.c

+14 −13
Original line number Diff line number Diff line
@@ -757,24 +757,24 @@ cleanup: 


SPDK_RPC_REGISTER("decouple_parent_lvol_bdev", spdk_rpc_decouple_parent_lvol_bdev, SPDK_RPC_RUNTIME)



struct rpc_resize_lvol_bdev {

struct rpc_bdev_lvol_resize {

	char *name;

	uint64_t size;

};



static void

free_rpc_resize_lvol_bdev(struct rpc_resize_lvol_bdev *req)

free_rpc_bdev_lvol_resize(struct rpc_bdev_lvol_resize *req)

{

	free(req->name);

}



static const struct spdk_json_object_decoder rpc_resize_lvol_bdev_decoders[] = {

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

	{"size", offsetof(struct rpc_resize_lvol_bdev, size), spdk_json_decode_uint64},

static const struct spdk_json_object_decoder rpc_bdev_lvol_resize_decoders[] = {

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

	{"size", offsetof(struct rpc_bdev_lvol_resize, size), spdk_json_decode_uint64},

};



static void

_spdk_rpc_resize_lvol_bdev_cb(void *cb_arg, int lvolerrno)

_spdk_rpc_bdev_lvol_resize_cb(void *cb_arg, int lvolerrno)

{

	struct spdk_json_write_ctx *w;

	struct spdk_jsonrpc_request *request = cb_arg;
@@ -794,17 +794,17 @@ invalid: 
}



static void

spdk_rpc_resize_lvol_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_lvol_resize(struct spdk_jsonrpc_request *request,

			  const struct spdk_json_val *params)

{

	struct rpc_resize_lvol_bdev req = {};

	struct rpc_bdev_lvol_resize req = {};

	struct spdk_bdev *bdev;

	struct spdk_lvol *lvol;



	SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "Resizing lvol\n");



	if (spdk_json_decode_object(params, rpc_resize_lvol_bdev_decoders,

				    SPDK_COUNTOF(rpc_resize_lvol_bdev_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_lvol_resize_decoders,

				    SPDK_COUNTOF(rpc_bdev_lvol_resize_decoders),

				    &req)) {

		SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
@@ -825,13 +825,14 @@ spdk_rpc_resize_lvol_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	vbdev_lvol_resize(lvol, req.size, _spdk_rpc_resize_lvol_bdev_cb, request);

	vbdev_lvol_resize(lvol, req.size, _spdk_rpc_bdev_lvol_resize_cb, request);



cleanup:

	free_rpc_resize_lvol_bdev(&req);

	free_rpc_bdev_lvol_resize(&req);

}



SPDK_RPC_REGISTER("resize_lvol_bdev", spdk_rpc_resize_lvol_bdev, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_lvol_resize", spdk_rpc_bdev_lvol_resize, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_resize, resize_lvol_bdev)



struct rpc_set_ro_lvol_bdev {

	char *name;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -1236,15 +1236,16 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('name', help='lvol bdev name')

    p.set_defaults(func=decouple_parent_lvol_bdev)



    def resize_lvol_bdev(args):

        rpc.lvol.resize_lvol_bdev(args.client,

    def bdev_lvol_resize(args):

        rpc.lvol.bdev_lvol_resize(args.client,

                                  name=args.name,

                                  size=args.size * 1024 * 1024)



    p = subparsers.add_parser('resize_lvol_bdev', help='Resize existing lvol bdev')

    p = subparsers.add_parser('bdev_lvol_resize', aliases=['resize_lvol_bdev'],

                              help='Resize existing lvol bdev')

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

    p.add_argument('size', help='new size in MiB for this bdev', type=int)

    p.set_defaults(func=resize_lvol_bdev)

    p.set_defaults(func=bdev_lvol_resize)



    def bdev_lvol_set_read_only(args):

        rpc.lvol.bdev_lvol_set_read_only(args.client,

scripts/rpc/lvol.py

+3 −2
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ def bdev_lvol_rename(client, old_name, new_name): 
    return client.call('bdev_lvol_rename', params)





def resize_lvol_bdev(client, name, size):

@deprecated_alias('resize_lvol_bdev')

def bdev_lvol_resize(client, name, size):

    """Resize a logical volume.



    Args:
@@ -126,7 +127,7 @@ def resize_lvol_bdev(client, name, size): 
        'name': name,

        'size': size,

    }

    return client.call('resize_lvol_bdev', params)

    return client.call('bdev_lvol_resize', params)





@deprecated_alias('set_read_only_lvol_bdev')