From 975efa2aff7540de3f6a7db9897de165f28649ee Mon Sep 17 00:00:00 2001 From: Maciej Wawryk Date: Mon, 26 Aug 2019 15:35:53 +0200 Subject: [PATCH] RPC: rename rpc decouple_parent_lvol_bdev to bdev_lvol_decouple_parent Signed-off-by: Maciej Wawryk Change-Id: I0ef3b8466bffc66d5a5badd274aac394ec0253db Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466296 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Broadcom SPDK FC-NVMe CI --- doc/jsonrpc.md | 6 +++--- doc/lvol.md | 2 +- module/bdev/lvol/vbdev_lvol_rpc.c | 5 +++-- scripts/rpc.py | 9 +++++---- scripts/rpc/lvol.py | 5 +++-- test/lvol/rpc_commands_lib.py | 6 +++--- test/lvol/test_cases.py | 6 +++--- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 86a5cf071..1d6e47d92 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -303,7 +303,7 @@ Example response: "destroy_lvol_bdev", "bdev_lvol_resize", "bdev_lvol_set_read_only", - "decouple_parent_lvol_bdev", + "bdev_lvol_decouple_parent", "inflate_lvol_bdev", "bdev_lvol_rename", "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. @@ -5267,7 +5267,7 @@ Example request: ~~~ { "jsonrpc": "2.0", - "method": "decouple_parent_lvol_bdev", + "method": "bdev_lvol_decouple_parent", "id": 1. "params": { "name": "8d87fccc-c278-49f0-9d4c-6237951aca09" diff --git a/doc/lvol.md b/doc/lvol.md index cc1abe932..f0b43247a 100644 --- a/doc/lvol.md +++ b/doc/lvol.md @@ -153,7 +153,7 @@ inflate_lvol_bdev [-h] name Inflate lvol bdev optional arguments: -h, --help show help -decouple_parent_lvol_bdev [-h] name +bdev_lvol_decouple_parent [-h] name Decouple parent of a logical volume optional arguments: -h, --help show help diff --git a/module/bdev/lvol/vbdev_lvol_rpc.c b/module/bdev/lvol/vbdev_lvol_rpc.c index b7a85d387..6ce9f36b7 100644 --- a/module/bdev/lvol/vbdev_lvol_rpc.c +++ b/module/bdev/lvol/vbdev_lvol_rpc.c @@ -717,7 +717,7 @@ cleanup: SPDK_RPC_REGISTER("inflate_lvol_bdev", spdk_rpc_inflate_lvol_bdev, SPDK_RPC_RUNTIME) 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) { struct rpc_inflate_lvol_bdev req = {}; @@ -755,7 +755,8 @@ cleanup: 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 { char *name; diff --git a/scripts/rpc.py b/scripts/rpc.py index 91bcb587f..041552492 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -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.set_defaults(func=inflate_lvol_bdev) - def decouple_parent_lvol_bdev(args): - rpc.lvol.decouple_parent_lvol_bdev(args.client, + def bdev_lvol_decouple_parent(args): + rpc.lvol.bdev_lvol_decouple_parent(args.client, 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.set_defaults(func=decouple_parent_lvol_bdev) + p.set_defaults(func=bdev_lvol_decouple_parent) def bdev_lvol_resize(args): rpc.lvol.bdev_lvol_resize(args.client, diff --git a/scripts/rpc/lvol.py b/scripts/rpc/lvol.py index b32dd1c4e..6b38a1845 100644 --- a/scripts/rpc/lvol.py +++ b/scripts/rpc/lvol.py @@ -167,7 +167,8 @@ def inflate_lvol_bdev(client, name): 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. Args: @@ -176,7 +177,7 @@ def decouple_parent_lvol_bdev(client, name): params = { '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): diff --git a/test/lvol/rpc_commands_lib.py b/test/lvol/rpc_commands_lib.py index 8e952986b..c18ebe532 100644 --- a/test/lvol/rpc_commands_lib.py +++ b/test/lvol/rpc_commands_lib.py @@ -229,9 +229,9 @@ class Commands_Rpc(object): output, rc = self.rpc.inflate_lvol_bdev(clone_name) return rc - def decouple_parent_lvol_bdev(self, clone_name): - print("INFO: RPC COMMAND decouple_parent_lvol_bdev") - output, rc = self.rpc.decouple_parent_lvol_bdev(clone_name) + def bdev_lvol_decouple_parent(self, clone_name): + print("INFO: RPC COMMAND bdev_lvol_decouple_parent") + output, rc = self.rpc.bdev_lvol_decouple_parent(clone_name) return rc def bdev_aio_create(self, aio_path, aio_name, aio_bs=""): diff --git a/test/lvol/test_cases.py b/test/lvol/test_cases.py index 4fff09fb0..de93b3fd0 100644 --- a/test/lvol/test_cases.py +++ b/test/lvol/test_cases.py @@ -2695,7 +2695,7 @@ class TestCases(object): lvol_bdev = self.c.get_lvol_bdev_with_name(uuid_bdev0) # 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: print("ERROR: Decouple parent on bdev without parent should " "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) # 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) 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: @@ -2803,7 +2803,7 @@ class TestCases(object): fill_range * MEGABYTE, "read", pattern[i]) # 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) # Check data consistency