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

rpc: Rename delete_nvme_controller to bdev_nvme_detach_controller

Browse Source 
Change-Id: I1402fcb24a779e7af3d108c91a0abcc09082410b
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466144
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: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Pawel Kaminski 2019-08-23 11:12:13 -04:00 committed by Jim Harris
parent f161e76dff
commit 31e77a7331
19 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/bdev.md
View File

@ -405,11 +405,11 @@ This command will create NVMe bdev of physical device in the system.
This command will create NVMe bdev of NVMe-oF resource. This command will create NVMe bdev of NVMe-oF resource.
To remove a NVMe controller use the delete_nvme_controller command. To remove an NVMe controller use the bdev_nvme_detach_controller command.
`rpc.py delete_nvme_controller Nvme0` `rpc.py bdev_nvme_detach_controller Nvme0`
This command will remove NVMe controller named Nvme0. This command will remove NVMe bdev named Nvme0.
# Logical volumes {#bdev_ug_logical_volumes} # Logical volumes {#bdev_ug_logical_volumes}

8
doc/jsonrpc.md
View File

@ -293,7 +293,7 @@ Example response:
"bdev_passthru_create", "bdev_passthru_create",
"bdev_passthru_delete" "bdev_passthru_delete"
"bdev_nvme_apply_firmware", "bdev_nvme_apply_firmware",
"delete_nvme_controller", "bdev_nvme_detach_controller",
"bdev_nvme_attach_controller", "bdev_nvme_attach_controller",
"bdev_null_create", "bdev_null_create",
"bdev_malloc_delete", "bdev_malloc_delete",
@ -1592,9 +1592,9 @@ Example response:
} }
~~~ ~~~
## delete_nvme_controller {#rpc_delete_nvme_controller} ## bdev_nvme_detach_controller {#rpc_bdev_nvme_detach_controller}
Delete NVMe controller. Detach NVMe controller and delete any associated bdevs.
### Parameters ### Parameters
@ -1612,7 +1612,7 @@ Example requests:
"name": "Nvme0" "name": "Nvme0"
}, },
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "delete_nvme_controller", "method": "bdev_nvme_detach_controller",
"id": 1 "id": 1
} }
~~~ ~~~

24
module/bdev/nvme/bdev_nvme_rpc.c
View File

@ -413,30 +413,30 @@ cleanup:
SPDK_RPC_REGISTER("bdev_nvme_get_controllers", spdk_rpc_bdev_nvme_get_controllers, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_nvme_get_controllers", spdk_rpc_bdev_nvme_get_controllers, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_get_controllers, get_nvme_controllers) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_get_controllers, get_nvme_controllers)
struct rpc_delete_nvme { struct rpc_bdev_nvme_detach_controller {
char *name; char *name;
}; };
static void static void
free_rpc_delete_nvme(struct rpc_delete_nvme *req) free_rpc_bdev_nvme_detach_controller(struct rpc_bdev_nvme_detach_controller *req)
{ {
free(req->name); free(req->name);
} }
static const struct spdk_json_object_decoder rpc_delete_nvme_decoders[] = { static const struct spdk_json_object_decoder rpc_bdev_nvme_detach_controller_decoders[] = {
{"name", offsetof(struct rpc_delete_nvme, name), spdk_json_decode_string}, {"name", offsetof(struct rpc_bdev_nvme_detach_controller, name), spdk_json_decode_string},
}; };
static void static void
spdk_rpc_delete_nvme_controller(struct spdk_jsonrpc_request *request, spdk_rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_nvme req = {NULL}; struct rpc_bdev_nvme_detach_controller req = {NULL};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
int rc = 0; int rc = 0;
if (spdk_json_decode_object(params, rpc_delete_nvme_decoders, if (spdk_json_decode_object(params, rpc_bdev_nvme_detach_controller_decoders,
SPDK_COUNTOF(rpc_delete_nvme_decoders), SPDK_COUNTOF(rpc_bdev_nvme_detach_controller_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");
@ -454,9 +454,11 @@ spdk_rpc_delete_nvme_controller(struct spdk_jsonrpc_request *request,
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
cleanup: cleanup:
free_rpc_delete_nvme(&req); free_rpc_bdev_nvme_detach_controller(&req);
} }
SPDK_RPC_REGISTER("delete_nvme_controller", spdk_rpc_delete_nvme_controller, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_nvme_detach_controller", spdk_rpc_bdev_nvme_detach_controller,
SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_detach_controller, delete_nvme_controller)
struct rpc_apply_firmware { struct rpc_apply_firmware {
char *filename; char *filename;

12
scripts/rpc.py
View File

@ -421,14 +421,14 @@ if __name__ == "__main__":
p.add_argument('-n', '--name', help="Name of the NVMe controller. Example: Nvme0", required=False) p.add_argument('-n', '--name', help="Name of the NVMe controller. Example: Nvme0", required=False)
p.set_defaults(func=bdev_nvme_get_controllers) p.set_defaults(func=bdev_nvme_get_controllers)
def delete_nvme_controller(args): def bdev_nvme_detach_controller(args):
rpc.bdev.delete_nvme_controller(args.client, rpc.bdev.bdev_nvme_detach_controller(args.client,
name=args.name) name=args.name)
p = subparsers.add_parser('delete_nvme_controller', p = subparsers.add_parser('bdev_nvme_detach_controller', aliases=['delete_nvme_controller'],
help='Delete a NVMe controller using controller name') help='Detach an NVMe controller and delete any associated bdevs')
p.add_argument('name', help="Name of the controller") p.add_argument('name', help="Name of the controller")
p.set_defaults(func=delete_nvme_controller) p.set_defaults(func=bdev_nvme_detach_controller)
def bdev_rbd_create(args): def bdev_rbd_create(args):
config = None config = None

7
scripts/rpc/bdev.py
View File

@ -444,15 +444,16 @@ def bdev_nvme_attach_controller(client, name, trtype, traddr, adrfam=None, trsvc
return client.call('bdev_nvme_attach_controller', params) return client.call('bdev_nvme_attach_controller', params)
def delete_nvme_controller(client, name): @deprecated_alias('delete_nvme_controller')
"""Remove NVMe controller from the system. def bdev_nvme_detach_controller(client, name):
"""Detach NVMe controller and delete any associated bdevs.
Args: Args:
name: controller name name: controller name
""" """
params = {'name': name} params = {'name': name}
return client.call('delete_nvme_controller', params) return client.call('bdev_nvme_detach_controller', params)
@deprecated_alias('construct_rbd_bdev') @deprecated_alias('construct_rbd_bdev')

2
scripts/spdkcli/ui_node.py
View File

@ -284,7 +284,7 @@ class UINvmeBdev(UIBdev):
UIBdev.__init__(self, "nvme", parent) UIBdev.__init__(self, "nvme", parent)
def delete(self, name): def delete(self, name):
self.get_root().delete_nvme_controller(name=name) self.get_root().bdev_nvme_detach_controller(name=name)
def ui_command_create(self, name, trtype, traddr, def ui_command_create(self, name, trtype, traddr,
adrfam=None, trsvcid=None, subnqn=None): adrfam=None, trsvcid=None, subnqn=None):

4
scripts/spdkcli/ui_root.py
View File

@ -168,8 +168,8 @@ class UIRoot(UINode):
return response return response
@verbose @verbose
def delete_nvme_controller(self, **kwargs): def bdev_nvme_detach_controller(self, **kwargs):
rpc.bdev.delete_nvme_controller(self.client, **kwargs) rpc.bdev.bdev_nvme_detach_controller(self.client, **kwargs)
@verbose @verbose
def bdev_null_create(self, **kwargs): def bdev_null_create(self, **kwargs):

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

@ -126,7 +126,7 @@ $rpc_py bdev_split_delete Nvme0n1
$rpc_py bdev_error_delete EE_Malloc0 $rpc_py bdev_error_delete EE_Malloc0
if [ -z "$NO_NVME" ]; then if [ -z "$NO_NVME" ]; then
$rpc_py delete_nvme_controller Nvme0 $rpc_py bdev_nvme_detach_controller Nvme0
fi fi
killprocess $pid killprocess $pid

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

@ -22,7 +22,7 @@ function remove_backends() {
$rpc_py bdev_lvol_delete_lvstore -l lvs_0 $rpc_py bdev_lvol_delete_lvstore -l lvs_0
echo "INFO: Removing NVMe" echo "INFO: Removing NVMe"
$rpc_py delete_nvme_controller Nvme0 $rpc_py bdev_nvme_detach_controller Nvme0
return 0 return 0
} }

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

@ -29,7 +29,7 @@ function remove_backends() {
echo "INFO: lvol store lvs0 removed" echo "INFO: lvol store lvs0 removed"
echo "INFO: Removing NVMe" echo "INFO: Removing NVMe"
$rpc_py delete_nvme_controller Nvme0 $rpc_py bdev_nvme_detach_controller Nvme0
return 0 return 0
} }

2
test/json_config/clear_config.py
View File

@ -64,7 +64,7 @@ def clear_bdev_subsystem(args, bdev_config):
nvme_controllers = args.client.call("bdev_nvme_get_controllers") nvme_controllers = args.client.call("bdev_nvme_get_controllers")
for ctrlr in nvme_controllers: for ctrlr in nvme_controllers:
args.client.call('delete_nvme_controller', {'name': ctrlr['name']}) args.client.call('bdev_nvme_detach_controller', {'name': ctrlr['name']})
''' Disable and reset hotplug ''' ''' Disable and reset hotplug '''
rpc.bdev.bdev_nvme_set_hotplug(args.client, False) rpc.bdev.bdev_nvme_set_hotplug(args.client, False)

2
test/nvmf/host/fio.sh
View File

@ -74,7 +74,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
$rpc_py bdev_lvol_delete_lvstore -l lvs_n_0 $rpc_py bdev_lvol_delete_lvstore -l lvs_n_0
$rpc_py bdev_lvol_delete lvs_0/lbd_0 $rpc_py bdev_lvol_delete lvs_0/lbd_0
$rpc_py bdev_lvol_delete_lvstore -l lvs_0 $rpc_py bdev_lvol_delete_lvstore -l lvs_0
$rpc_py delete_nvme_controller Nvme0 $rpc_py bdev_nvme_detach_controller Nvme0
fi fi
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT

2
test/vhost/hotplug/common.sh
View File

@ -215,7 +215,7 @@ function get_traddr() {
} }
function delete_nvme() { function delete_nvme() {
$rpc_py delete_nvme_controller $1 $rpc_py bdev_nvme_detach_controller $1
} }
function add_nvme() { function add_nvme() {

2
test/vhost/initiator/blockdev.sh
View File

@ -107,7 +107,7 @@ run_spdk_fio $testdir/bdev.fio --filename=$virtio_with_unmap --spdk_conf=$testdi
--spdk_conf=$testdir/bdev.conf --spdk_conf=$testdir/bdev.conf
timing_exit run_spdk_fio_unmap timing_exit run_spdk_fio_unmap
$RPC_PY delete_nvme_controller Nvme0 $RPC_PY bdev_nvme_detach_controller Nvme0
timing_enter vhost_kill timing_enter vhost_kill
vhost_kill 0 vhost_kill 0

2
test/vhost/integrity/integrity_start.sh
View File

@ -95,7 +95,7 @@ vm_shutdown_all
clean_lvol_cfg clean_lvol_cfg
$rpc_py delete_nvme_controller Nvme0 $rpc_py bdev_nvme_detach_controller Nvme0
notice "Shutting down SPDK vhost app..." notice "Shutting down SPDK vhost app..."
vhost_kill 0 vhost_kill 0

2
test/vhost/migration/migration-tc2.sh
View File

@ -45,7 +45,7 @@ function migration_tc2_cleanup_vhost_config()
notice "Removing vhost devices & controllers via RPC ..." notice "Removing vhost devices & controllers via RPC ..."
# Delete bdev first to remove all LUNs and SCSI targets # Delete bdev first to remove all LUNs and SCSI targets
$rpc_0 delete_nvme_controller Nvme0 $rpc_0 bdev_nvme_detach_controller Nvme0
$rpc_0 vhost_delete_controller $incoming_vm_ctrlr $rpc_0 vhost_delete_controller $incoming_vm_ctrlr
$rpc_1 delete_nvme_controller Nvme0 $rpc_1 delete_nvme_controller Nvme0

2
test/vhost/migration/migration-tc3a.sh
View File

@ -84,7 +84,7 @@ function host1_cleanup_vhost()
vm_kill $incoming_vm vm_kill $incoming_vm
notice "Removing bdev & controller from vhost on local server" notice "Removing bdev & controller from vhost on local server"
$rpc_0 delete_nvme_controller Nvme0 $rpc_0 bdev_nvme_detach_controller Nvme0
$rpc_0 vhost_delete_controller $incoming_vm_ctrlr $rpc_0 vhost_delete_controller $incoming_vm_ctrlr
notice "Shutting down vhost app" notice "Shutting down vhost app"

2
test/vhost/migration/migration-tc3b.sh
View File

@ -16,7 +16,7 @@ function host_2_cleanup_vhost()
vm_kill $target_vm vm_kill $target_vm
notice "Removing bdev & controller from vhost 1 on remote server" notice "Removing bdev & controller from vhost 1 on remote server"
$rpc delete_nvme_controller Nvme0 $rpc bdev_nvme_detach_controller Nvme0
$rpc vhost_delete_controller $target_vm_ctrl $rpc vhost_delete_controller $target_vm_ctrl
notice "Shutting down vhost app" notice "Shutting down vhost app"

2
test/vhost/readonly/readonly.sh
View File

@ -127,7 +127,7 @@ fi
blk_ro_tc1 blk_ro_tc1
$rpc_py delete_nvme_controller Nvme0 $rpc_py bdev_nvme_detach_controller Nvme0
vhost_kill 0 vhost_kill 0