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

RPC: rename rpc decouple_parent_lvol_bdev to bdev_lvol_decouple_parent

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I0ef3b8466bffc66d5a5badd274aac394ec0253db
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466296
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:35:53 +02:00 committed by Ben Walker
parent 568ce213bb
commit 975efa2aff
7 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/jsonrpc.md
View File

@ -303,7 +303,7 @@ Example response:
"destroy_lvol_bdev", "destroy_lvol_bdev",
"bdev_lvol_resize", "bdev_lvol_resize",
"bdev_lvol_set_read_only", "bdev_lvol_set_read_only",
"decouple_parent_lvol_bdev", "bdev_lvol_decouple_parent",
"inflate_lvol_bdev", "inflate_lvol_bdev",
"bdev_lvol_rename", "bdev_lvol_rename",
"bdev_lvol_clone", "bdev_lvol_clone",
@ -5250,7 +5250,7 @@ Example response:
} }
~~~ ~~~
## decouple_parent_lvol_bdev {#rpc_decouple_parent_lvol_bdev} ## bdev_lvol_decouple_parent {#rpc_bdev_lvol_decouple_parent}
Decouple the parent of a logical volume. For unallocated clusters which is allocated in the parent, they are allocated and copied from the parent, but for unallocated clusters which is thin provisioned in the parent, they are kept thin provisioned. Then all dependencies on the parent are removed. Decouple the parent of a logical volume. For unallocated clusters which is allocated in the parent, they are allocated and copied from the parent, but for unallocated clusters which is thin provisioned in the parent, they are kept thin provisioned. Then all dependencies on the parent are removed.
@ -5267,7 +5267,7 @@ Example request:
~~~ ~~~
{ {
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "decouple_parent_lvol_bdev", "method": "bdev_lvol_decouple_parent",
"id": 1. "id": 1.
"params": { "params": {
"name": "8d87fccc-c278-49f0-9d4c-6237951aca09" "name": "8d87fccc-c278-49f0-9d4c-6237951aca09"

2
doc/lvol.md
View File

@ -153,7 +153,7 @@ inflate_lvol_bdev [-h] name
Inflate lvol bdev Inflate lvol bdev
optional arguments: optional arguments:
-h, --help show help -h, --help show help
decouple_parent_lvol_bdev [-h] name bdev_lvol_decouple_parent [-h] name
Decouple parent of a logical volume Decouple parent of a logical volume
optional arguments: optional arguments:
-h, --help show help -h, --help show help

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

@ -717,7 +717,7 @@ cleanup:
SPDK_RPC_REGISTER("inflate_lvol_bdev", spdk_rpc_inflate_lvol_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("inflate_lvol_bdev", spdk_rpc_inflate_lvol_bdev, SPDK_RPC_RUNTIME)
static void static void
spdk_rpc_decouple_parent_lvol_bdev(struct spdk_jsonrpc_request *request, spdk_rpc_bdev_lvol_decouple_parent(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_inflate_lvol_bdev req = {}; struct rpc_inflate_lvol_bdev req = {};
@ -755,7 +755,8 @@ cleanup:
free_rpc_inflate_lvol_bdev(&req); free_rpc_inflate_lvol_bdev(&req);
} }
SPDK_RPC_REGISTER("decouple_parent_lvol_bdev", spdk_rpc_decouple_parent_lvol_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_lvol_decouple_parent", spdk_rpc_bdev_lvol_decouple_parent, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_decouple_parent, decouple_parent_lvol_bdev)
struct rpc_bdev_lvol_resize { struct rpc_bdev_lvol_resize {
char *name; char *name;

9
scripts/rpc.py
View File

@ -1236,13 +1236,14 @@ 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.add_argument('name', help='lvol bdev name')
p.set_defaults(func=inflate_lvol_bdev) p.set_defaults(func=inflate_lvol_bdev)
def decouple_parent_lvol_bdev(args): def bdev_lvol_decouple_parent(args):
rpc.lvol.decouple_parent_lvol_bdev(args.client, rpc.lvol.bdev_lvol_decouple_parent(args.client,
name=args.name) name=args.name)
p = subparsers.add_parser('decouple_parent_lvol_bdev', help='Decouple parent of lvol') p = subparsers.add_parser('bdev_lvol_decouple_parent', aliases=['decouple_parent_lvol_bdev'],
help='Decouple parent of lvol')
p.add_argument('name', help='lvol bdev name') p.add_argument('name', help='lvol bdev name')
p.set_defaults(func=decouple_parent_lvol_bdev) p.set_defaults(func=bdev_lvol_decouple_parent)
def bdev_lvol_resize(args): def bdev_lvol_resize(args):
rpc.lvol.bdev_lvol_resize(args.client, rpc.lvol.bdev_lvol_resize(args.client,

5
scripts/rpc/lvol.py
View File

@ -167,7 +167,8 @@ def inflate_lvol_bdev(client, name):
return client.call('inflate_lvol_bdev', params) return client.call('inflate_lvol_bdev', params)
def decouple_parent_lvol_bdev(client, name): @deprecated_alias('decouple_parent_lvol_bdev')
def bdev_lvol_decouple_parent(client, name):
"""Decouple parent of a logical volume. """Decouple parent of a logical volume.
Args: Args:
@ -176,7 +177,7 @@ def decouple_parent_lvol_bdev(client, name):
params = { params = {
'name': name, 'name': name,
} }
return client.call('decouple_parent_lvol_bdev', params) return client.call('bdev_lvol_decouple_parent', params)
def destroy_lvol_store(client, uuid=None, lvs_name=None): def destroy_lvol_store(client, uuid=None, lvs_name=None):

6
test/lvol/rpc_commands_lib.py
View File

@ -229,9 +229,9 @@ class Commands_Rpc(object):
output, rc = self.rpc.inflate_lvol_bdev(clone_name) output, rc = self.rpc.inflate_lvol_bdev(clone_name)
return rc return rc
def decouple_parent_lvol_bdev(self, clone_name): def bdev_lvol_decouple_parent(self, clone_name):
print("INFO: RPC COMMAND decouple_parent_lvol_bdev") print("INFO: RPC COMMAND bdev_lvol_decouple_parent")
output, rc = self.rpc.decouple_parent_lvol_bdev(clone_name) output, rc = self.rpc.bdev_lvol_decouple_parent(clone_name)
return rc return rc
def bdev_aio_create(self, aio_path, aio_name, aio_bs=""): def bdev_aio_create(self, aio_path, aio_name, aio_bs=""):

6
test/lvol/test_cases.py
View File

@ -2695,7 +2695,7 @@ class TestCases(object):
lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0) lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0)
# Decouple parent lvol bdev and check if it fails # Decouple parent lvol bdev and check if it fails
ret_value = self.c.decouple_parent_lvol_bdev(lvol_bdev['name']) ret_value = self.c.bdev_lvol_decouple_parent(lvol_bdev['name'])
if ret_value == 0: if ret_value == 0:
print("ERROR: Decouple parent on bdev without parent should " print("ERROR: Decouple parent on bdev without parent should "
"fail but didn't") "fail but didn't")
@ -2706,7 +2706,7 @@ class TestCases(object):
snapshot_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name) snapshot_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name)
# Decouple parent lvol bdev # Decouple parent lvol bdev
fail_count += self.c.decouple_parent_lvol_bdev(lvol_bdev['name']) fail_count += self.c.bdev_lvol_decouple_parent(lvol_bdev['name'])
lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0) lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0)
snapshot_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name) snapshot_bdev = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name)
if lvol_bdev['driver_specific']['lvol']['thin_provision'] is not True: if lvol_bdev['driver_specific']['lvol']['thin_provision'] is not True:
@ -2803,7 +2803,7 @@ class TestCases(object):
fill_range * MEGABYTE, "read", pattern[i]) fill_range * MEGABYTE, "read", pattern[i])
# Decouple parent # Decouple parent
fail_count += self.c.decouple_parent_lvol_bdev(lvol_bdev['name']) fail_count += self.c.bdev_lvol_decouple_parent(lvol_bdev['name'])
lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0) lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0)
# Check data consistency # Check data consistency