ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RPC: rename rpc resize_lvol_bdev to bdev_lvol_resize

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Ic8df4b9d775bdcb61c8fa8354138318e78d56855
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466289
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
This commit is contained in:
Maciej Wawryk 2019-08-26 15:06:42 +02:00 committed by Jim Harris
parent b7ad0bd06c
commit c2d85bb204
9 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/jsonrpc.md
View File

@ -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",

2
doc/lvol.md
View File

@ -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

27
module/bdev/lvol/vbdev_lvol_rpc.c
View File

@ -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;

9
scripts/rpc.py
View File

@ -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,

5
scripts/rpc/lvol.py
View File

@ -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')

4
test/lvol/lvol.sh
View File

@ -29,14 +29,14 @@ function usage() {
100: 'construct_logical_volume_nonexistent_lvs_uuid',
101: 'construct_lvol_bdev_on_full_lvol_store',
102: 'construct_lvol_bdev_name_twice',
150: 'resize_lvol_bdev_positive',
150: 'bdev_lvol_resize_positive',
200: 'resize_logical_volume_nonexistent_logical_volume',
201: 'resize_logical_volume_with_size_out_of_range',
250: 'destroy_lvol_store_positive',
251: 'destroy_lvol_store_use_name_positive',
252: 'destroy_lvol_store_with_lvol_bdev_positive',
253: 'destroy_multi_logical_volumes_positive',
254: 'destroy_after_resize_lvol_bdev_positive',
254: 'destroy_after_bdev_lvol_resize_positive',
255: 'delete_lvol_store_persistent_positive',
300: 'destroy_lvol_store_nonexistent_lvs_uuid',
301: 'delete_lvol_store_underlying_bdev',

6
test/lvol/rpc_commands_lib.py
View File

@ -159,9 +159,9 @@ class Commands_Rpc(object):
output, rc = self.rpc.destroy_lvol_bdev(bdev_name)
return rc
def resize_lvol_bdev(self, uuid, new_size):
print("INFO: RPC COMMAND resize_lvol_bdev")
output, rc = self.rpc.resize_lvol_bdev(uuid, new_size)
def bdev_lvol_resize(self, uuid, new_size):
print("INFO: RPC COMMAND bdev_lvol_resize")
output, rc = self.rpc.bdev_lvol_resize(uuid, new_size)
return rc
def bdev_lvol_set_read_only(self, uuid):

36
test/lvol/test_cases.py
View File

@ -122,7 +122,7 @@ def case_message(func):
101: 'construct_lvol_bdev_on_full_lvol_store',
102: 'construct_lvol_bdev_name_twice',
# resize_lvol_store - positive tests
150: 'resize_lvol_bdev_positive',
150: 'bdev_lvol_resize_positive',
# resize lvol store - negative tests
200: 'resize_logical_volume_nonexistent_logical_volume',
201: 'resize_logical_volume_with_size_out_of_range',
@ -131,7 +131,7 @@ def case_message(func):
251: 'destroy_lvol_store_use_name_positive',
252: 'destroy_lvol_store_with_lvol_bdev_positive',
253: 'destroy_multi_logical_volumes_positive',
254: 'destroy_after_resize_lvol_bdev_positive',
254: 'destroy_after_bdev_lvol_resize_positive',
255: 'delete_lvol_store_persistent_positive',
# destroy_lvol_store - negative tests
300: 'destroy_lvol_store_nonexistent_lvs_uuid',
@ -627,7 +627,7 @@ class TestCases(object):
Positive test for resizing a logical_volume.
Call resize_lvol_bdev with correct logical_volumes name and new size.
Call bdev_lvol_resize with correct logical_volumes name and new size.
"""
# Construct malloc bdev
base_name = self.c.bdev_malloc_create(self.total_size,
@ -648,21 +648,21 @@ class TestCases(object):
# Resize lvol bdev on correct lvs_uuid and
# size is equal to half of size malloc bdev
size = self.get_lvs_divided_size(2)
self.c.resize_lvol_bdev(uuid_bdev, size)
self.c.bdev_lvol_resize(uuid_bdev, size)
# Check size of the lvol bdev by rpc command get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, size)
# Resize lvol bdev on the correct lvs_uuid and
# size is smaller by 1 cluster
size = (self.get_lvs_size() - self.get_lvs_cluster_size())
self.c.resize_lvol_bdev(uuid_bdev, size)
self.c.bdev_lvol_resize(uuid_bdev, size)
# Check size of the lvol bdev by rpc command get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, size)
# Resize lvol bdev on the correct lvs_uuid and
# size is equal 0 MiB
size = 0
self.c.resize_lvol_bdev(uuid_bdev, size)
self.c.bdev_lvol_resize(uuid_bdev, size)
# Check size of the lvol bdev by rpc command get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, size)
@ -681,12 +681,12 @@ class TestCases(object):
resize_logical_volume_nonexistent_logical_volume
Negative test for resizing a logical_volume.
Call resize_lvol_bdev with logical volume which does not
Call bdev_lvol_resize with logical volume which does not
exist in configuration.
"""
fail_count = 0
# Try resize lvol bdev on logical volume which does not exist
if self.c.resize_lvol_bdev(self._gen_lvb_uuid(), 16) == 0:
if self.c.bdev_lvol_resize(self._gen_lvb_uuid(), 16) == 0:
fail_count += 1
# Expected result:
@ -719,9 +719,9 @@ class TestCases(object):
lvs_size)
fail_count += self.c.check_get_bdevs_methods(uuid_bdev,
lvs_size)
# Try resize_lvol_bdev on correct lvs_uuid and size is
# Try bdev_lvol_resize on correct lvs_uuid and size is
# equal to size malloc bdev + 1MiB; this call should fail
if self.c.resize_lvol_bdev(uuid_bdev, self.total_size + 1) == 0:
if self.c.bdev_lvol_resize(uuid_bdev, self.total_size + 1) == 0:
fail_count += 1
self.c.destroy_lvol_bdev(uuid_bdev)
@ -729,7 +729,7 @@ class TestCases(object):
self.c.delete_malloc_bdev(base_name)
# Expected result:
# - resize_lvol_bdev call return code != 0
# - bdev_lvol_resize call return code != 0
# - Error code: ENODEV ("Not enough free clusters left on lvol store")
# response printed to stdout
# - no other operation fails
@ -907,30 +907,30 @@ class TestCases(object):
sz = size + 4
# Resize_lvol_bdev on correct lvs_uuid and size is
# equal to one quarter of size malloc bdev plus 4 MB
self.c.resize_lvol_bdev(uuid_bdev, sz)
self.c.bdev_lvol_resize(uuid_bdev, sz)
# check size of the lvol bdev by command RPC : get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, sz)
# Resize_lvol_bdev on correct lvs_uuid and size is
# equal half of size malloc bdev
sz = size * 2
self.c.resize_lvol_bdev(uuid_bdev, sz)
self.c.bdev_lvol_resize(uuid_bdev, sz)
# check size of the lvol bdev by command RPC : get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, sz)
# Resize_lvol_bdev on correct lvs_uuid and size is
# equal to three quarters of size malloc bdev
sz = size * 3
self.c.resize_lvol_bdev(uuid_bdev, sz)
self.c.bdev_lvol_resize(uuid_bdev, sz)
# check size of the lvol bdev by command RPC : get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, sz)
# Resize_lvol_bdev on correct lvs_uuid and size is
# equal to size if malloc bdev minus 4 MB
sz = (size * 4) - 4
self.c.resize_lvol_bdev(uuid_bdev, sz)
self.c.bdev_lvol_resize(uuid_bdev, sz)
# check size of the lvol bdev by command RPC : get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, sz)
# Resize_lvol_bdev on the correct lvs_uuid and size is equal 0 MiB
sz = 0
self.c.resize_lvol_bdev(uuid_bdev, sz)
self.c.bdev_lvol_resize(uuid_bdev, sz)
# check size of the lvol bdev by command RPC : get_bdevs
fail_count += self.c.check_get_bdevs_methods(uuid_bdev, sz)
@ -1673,7 +1673,7 @@ class TestCases(object):
free_clusters_start = int(lvs['free_clusters'])
# Resize bdev to full size of lvs
full_size = int(lvs['total_data_clusters'] * lvs['cluster_size'] / MEGABYTE)
fail_count += self.c.resize_lvol_bdev(uuid_bdev, full_size)
fail_count += self.c.bdev_lvol_resize(uuid_bdev, full_size)
# Check if bdev size changed (total_data_clusters*cluster_size
# equals to num_blocks*block_size)
lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev)
@ -1698,7 +1698,7 @@ class TestCases(object):
fail_count += 1
# Resize bdev to 25% of lvs and check if it ended with success
size = self.get_lvs_divided_size(4)
fail_count += self.c.resize_lvol_bdev(uuid_bdev, size)
fail_count += self.c.bdev_lvol_resize(uuid_bdev, size)
# Check free clusters on lvs
lvs = self.c.bdev_lvol_get_lvstores()[0]
free_clusters_resize2 = int(lvs['free_clusters'])

2
test/nvmf/target/nvmf_lvol.sh
View File

@ -50,7 +50,7 @@ sleep 1
# Perform some operations on the logical volume
snapshot=$($rpc_py snapshot_lvol_bdev $lvol "MY_SNAPSHOT")
$rpc_py resize_lvol_bdev $lvol $LVOL_BDEV_FINAL_SIZE
$rpc_py bdev_lvol_resize $lvol $LVOL_BDEV_FINAL_SIZE
clone=$($rpc_py bdev_lvol_clone $snapshot "MY_CLONE")
$rpc_py inflate_lvol_bdev $clone