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

RPC: rename rpc delete_rbd_bdev to bdev_rbd_delete

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Ie3250447b94d46929afa69de6ecd30aeda186331
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468028
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Maciej Wawryk 2019-09-11 10:00:10 +02:00 committed by Ben Walker
parent 8ac7cad492
commit 164939aa5a
9 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/bdev.md
View File

@ -115,9 +115,9 @@ Example command
This command will create a bdev that represents the 'foo' image from a pool called 'rbd'. This command will create a bdev that represents the 'foo' image from a pool called 'rbd'.
To remove a block device representation use the delete_rbd_bdev command. To remove a block device representation use the bdev_rbd_delete command.
`rpc.py delete_rbd_bdev Rbd0` `rpc.py bdev_rbd_delete Rbd0`
# Compression Virtual Bdev Module {#bdev_config_compress} # Compression Virtual Bdev Module {#bdev_config_compress}

4
doc/jsonrpc.md
View File

@ -1680,7 +1680,7 @@ response:
} }
~~~ ~~~
## delete_rbd_bdev {#rpc_delete_rbd_bdev} ## bdev_rbd_delete {#rpc_bdev_rbd_delete}
Delete @ref bdev_config_rbd bdev Delete @ref bdev_config_rbd bdev
@ -1706,7 +1706,7 @@ Example request:
"name": "Rbd0" "name": "Rbd0"
}, },
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "delete_rbd_bdev", "method": "bdev_rbd_delete",
"id": 1 "id": 1
} }
~~~ ~~~

25
module/bdev/rbd/bdev_rbd_rpc.c
View File

@ -144,22 +144,22 @@ cleanup:
SPDK_RPC_REGISTER("bdev_rbd_create", spdk_rpc_bdev_rbd_create, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_rbd_create", spdk_rpc_bdev_rbd_create, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_rbd_create, construct_rbd_bdev) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_rbd_create, construct_rbd_bdev)
struct rpc_delete_rbd { struct rpc_bdev_rbd_delete {
char *name; char *name;
}; };
static void static void
free_rpc_delete_rbd(struct rpc_delete_rbd *req) free_rpc_bdev_rbd_delete(struct rpc_bdev_rbd_delete *req)
{ {
free(req->name); free(req->name);
} }
static const struct spdk_json_object_decoder rpc_delete_rbd_decoders[] = { static const struct spdk_json_object_decoder rpc_bdev_rbd_delete_decoders[] = {
{"name", offsetof(struct rpc_delete_rbd, name), spdk_json_decode_string}, {"name", offsetof(struct rpc_bdev_rbd_delete, name), spdk_json_decode_string},
}; };
static void static void
_spdk_rpc_delete_rbd_bdev_cb(void *cb_arg, int bdeverrno) _spdk_rpc_bdev_rbd_delete_cb(void *cb_arg, int bdeverrno)
{ {
struct spdk_jsonrpc_request *request = cb_arg; struct spdk_jsonrpc_request *request = cb_arg;
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -170,14 +170,14 @@ _spdk_rpc_delete_rbd_bdev_cb(void *cb_arg, int bdeverrno)
} }
static void static void
spdk_rpc_delete_rbd_bdev(struct spdk_jsonrpc_request *request, spdk_rpc_bdev_rbd_delete(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_rbd req = {NULL}; struct rpc_bdev_rbd_delete req = {NULL};
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
if (spdk_json_decode_object(params, rpc_delete_rbd_decoders, if (spdk_json_decode_object(params, rpc_bdev_rbd_delete_decoders,
SPDK_COUNTOF(rpc_delete_rbd_decoders), SPDK_COUNTOF(rpc_bdev_rbd_delete_decoders),
&req)) { &req)) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed"); "spdk_json_decode_object failed");
@ -190,9 +190,10 @@ spdk_rpc_delete_rbd_bdev(struct spdk_jsonrpc_request *request,
goto cleanup; goto cleanup;
} }
spdk_bdev_rbd_delete(bdev, _spdk_rpc_delete_rbd_bdev_cb, request); spdk_bdev_rbd_delete(bdev, _spdk_rpc_bdev_rbd_delete_cb, request);
cleanup: cleanup:
free_rpc_delete_rbd(&req); free_rpc_bdev_rbd_delete(&req);
} }
SPDK_RPC_REGISTER("delete_rbd_bdev", spdk_rpc_delete_rbd_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_rbd_delete", spdk_rpc_bdev_rbd_delete, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_rbd_delete, delete_rbd_bdev)

9
scripts/rpc.py
View File

@ -439,13 +439,14 @@ if __name__ == "__main__":
p.add_argument('block_size', help='rbd block size', type=int) p.add_argument('block_size', help='rbd block size', type=int)
p.set_defaults(func=bdev_rbd_create) p.set_defaults(func=bdev_rbd_create)
def delete_rbd_bdev(args): def bdev_rbd_delete(args):
rpc.bdev.delete_rbd_bdev(args.client, rpc.bdev.bdev_rbd_delete(args.client,
name=args.name) name=args.name)
p = subparsers.add_parser('delete_rbd_bdev', help='Delete a rbd bdev') p = subparsers.add_parser('bdev_rbd_delete', aliases=['delete_rbd_bdev'],
help='Delete a rbd bdev')
p.add_argument('name', help='rbd bdev name') p.add_argument('name', help='rbd bdev name')
p.set_defaults(func=delete_rbd_bdev) p.set_defaults(func=bdev_rbd_delete)
def bdev_delay_create(args): def bdev_delay_create(args):
print_json(rpc.bdev.bdev_delay_create(args.client, print_json(rpc.bdev.bdev_delay_create(args.client,

5
scripts/rpc/bdev.py
View File

@ -463,14 +463,15 @@ def bdev_rbd_create(client, pool_name, rbd_name, block_size, name=None, user=Non
return client.call('bdev_rbd_create', params) return client.call('bdev_rbd_create', params)
def delete_rbd_bdev(client, name): @deprecated_alias('delete_rbd_bdev')
def bdev_rbd_delete(client, name):
"""Remove rbd bdev from the system. """Remove rbd bdev from the system.
Args: Args:
name: name of rbd bdev to delete name: name of rbd bdev to delete
""" """
params = {'name': name} params = {'name': name}
return client.call('delete_rbd_bdev', params) return client.call('bdev_rbd_delete', params)
@deprecated_alias('construct_error_bdev') @deprecated_alias('construct_error_bdev')

2
scripts/spdkcli/ui_node.py
View File

@ -461,7 +461,7 @@ class UIRbdBdev(UIBdev):
UIBdev.__init__(self, "rbd", parent) UIBdev.__init__(self, "rbd", parent)
def delete(self, name): def delete(self, name):
self.get_root().delete_rbd_bdev(name=name) self.get_root().bdev_rbd_delete(name=name)
def ui_command_create(self, pool_name, rbd_name, block_size, name=None): def ui_command_create(self, pool_name, rbd_name, block_size, name=None):
block_size = self.ui_eval_param(block_size, "number", None) block_size = self.ui_eval_param(block_size, "number", None)

4
scripts/spdkcli/ui_root.py
View File

@ -235,8 +235,8 @@ class UIRoot(UINode):
return response return response
@verbose @verbose
def delete_rbd_bdev(self, **kwargs): def bdev_rbd_delete(self, **kwargs):
response = rpc.bdev.delete_rbd_bdev(self.client, **kwargs) response = rpc.bdev.bdev_rbd_delete(self.client, **kwargs)
return response return response
@verbose @verbose

2
test/iscsi_tgt/rbd/rbd.sh
View File

@ -62,7 +62,7 @@ rm -f ./local-job0-0-verify.state
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT
iscsicleanup iscsicleanup
$rpc_py delete_rbd_bdev $rbd_bdev $rpc_py bdev_rbd_delete $rbd_bdev
killprocess $pid killprocess $pid
rbd_cleanup rbd_cleanup

56
test/json_config/clear_config.py
View File

@ -30,25 +30,25 @@ def get_bdev_name(bdev):
return bdev_name return bdev_name
def get_bdev_destroy_method(bdev): def get_bdev_delete_method(bdev):
destroy_method_map = {'bdev_malloc_create': "bdev_malloc_delete", delete_method_map = {'bdev_malloc_create': "bdev_malloc_delete",
'bdev_null_create': "bdev_null_delete", 'bdev_null_create': "bdev_null_delete",
'bdev_rbd_create': "delete_rbd_bdev", 'bdev_rbd_create': "bdev_rbd_delete",
'bdev_pmem_create': "bdev_pmem_delete", 'bdev_pmem_create': "bdev_pmem_delete",
'bdev_aio_create': "bdev_aio_delete", 'bdev_aio_create': "bdev_aio_delete",
'bdev_error_create': "bdev_error_delete", 'bdev_error_create': "bdev_error_delete",
'construct_split_vbdev': "destruct_split_vbdev", 'construct_split_vbdev': "destruct_split_vbdev",
'construct_virtio_dev': "remove_virtio_bdev", 'construct_virtio_dev': "remove_virtio_bdev",
'bdev_crypto_create': "bdev_crypto_delete", 'bdev_crypto_create': "bdev_crypto_delete",
'bdev_delay_create': "bdev_delay_delete", 'bdev_delay_create': "bdev_delay_delete",
'construct_passthru_bdev': "delete_passthru_bdev", 'construct_passthru_bdev': "delete_passthru_bdev",
'bdev_compress_create': 'bdev_compress_delete', 'bdev_compress_create': 'bdev_compress_delete',
} }
destroy_method = None destroy_method = None
if 'method' in bdev: if 'method' in bdev:
construct_method = bdev['method'] construct_method = bdev['method']
if construct_method in list(destroy_method_map.keys()): if construct_method in list(delete_method_map.keys()):
destroy_method = destroy_method_map[construct_method] destroy_method = delete_method_map[construct_method]
return destroy_method return destroy_method
@ -58,7 +58,7 @@ def clear_bdev_subsystem(args, bdev_config):
for bdev in bdev_config: for bdev in bdev_config:
bdev_name_key = get_bdev_name_key(bdev) bdev_name_key = get_bdev_name_key(bdev)
bdev_name = get_bdev_name(bdev) bdev_name = get_bdev_name(bdev)
destroy_method = get_bdev_destroy_method(bdev) destroy_method = get_bdev_delete_method(bdev)
if destroy_method: if destroy_method:
args.client.call(destroy_method, {bdev_name_key: bdev_name}) args.client.call(destroy_method, {bdev_name_key: bdev_name})
@ -71,9 +71,9 @@ def clear_bdev_subsystem(args, bdev_config):
def get_nvmf_destroy_method(nvmf): def get_nvmf_destroy_method(nvmf):
destroy_method_map = {'nvmf_subsystem_create': "delete_nvmf_subsystem"} delete_method_map = {'nvmf_subsystem_create': "delete_nvmf_subsystem"}
try: try:
return destroy_method_map[nvmf['method']] return delete_method_map[nvmf['method']]
except KeyError: except KeyError:
return None return None
@ -86,12 +86,12 @@ def clear_nvmf_subsystem(args, nvmf_config):
def get_iscsi_destroy_method(iscsi): def get_iscsi_destroy_method(iscsi):
destroy_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group", delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group",
'add_initiator_group': "delete_initiator_group", 'add_initiator_group': "delete_initiator_group",
'iscsi_create_target_node': "delete_target_node", 'iscsi_create_target_node': "delete_target_node",
'set_iscsi_options': None 'set_iscsi_options': None
} }
return destroy_method_map[iscsi['method']] return delete_method_map[iscsi['method']]
def get_iscsi_name(iscsi): def get_iscsi_name(iscsi):
@ -116,9 +116,9 @@ def clear_iscsi_subsystem(args, iscsi_config):
def get_nbd_destroy_method(nbd): def get_nbd_destroy_method(nbd):
destroy_method_map = {'start_nbd_disk': "stop_nbd_disk" delete_method_map = {'start_nbd_disk': "stop_nbd_disk"
} }
return destroy_method_map[nbd['method']] return delete_method_map[nbd['method']]
def clear_nbd_subsystem(args, nbd_config): def clear_nbd_subsystem(args, nbd_config):