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

RPC: rename construct_split_vbdev to bdev_split_create

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I37459e3c421e8c657f8d9a8647cdbccc4193bb58
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468089
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Maciej Wawryk 2019-09-11 13:10:43 +02:00 committed by Jim Harris
parent 72d06a99e1
commit a1bda4e1aa
18 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/jsonrpc.md
View File

@ -286,7 +286,7 @@ Example response:
"bdev_aio_delete", "bdev_aio_delete",
"bdev_aio_create", "bdev_aio_create",
"destruct_split_vbdev", "destruct_split_vbdev",
"construct_split_vbdev", "bdev_split_create",
"bdev_error_inject_error", "bdev_error_inject_error",
"bdev_error_delete", "bdev_error_delete",
"bdev_error_create", "bdev_error_create",
@ -445,7 +445,7 @@ Example response:
"split_size_mb": 0, "split_size_mb": 0,
"split_count": 2 "split_count": 2
}, },
"method": "construct_split_vbdev" "method": "bdev_split_create"
}, },
{ {
"params": { "params": {

2
module/bdev/split/vbdev_split.c
View File

@ -505,7 +505,7 @@ vbdev_split_config_json(struct spdk_json_write_ctx *w)
TAILQ_FOREACH(cfg, &g_split_config, tailq) { TAILQ_FOREACH(cfg, &g_split_config, tailq) {
spdk_json_write_object_begin(w); spdk_json_write_object_begin(w);
spdk_json_write_named_string(w, "method", "construct_split_vbdev"); spdk_json_write_named_string(w, "method", "bdev_split_create");
spdk_json_write_named_object_begin(w, "params"); spdk_json_write_named_object_begin(w, "params");
spdk_json_write_named_string(w, "base_bdev", cfg->base_bdev); spdk_json_write_named_string(w, "base_bdev", cfg->base_bdev);

7
module/bdev/split/vbdev_split_rpc.c
View File

@ -51,8 +51,8 @@ static const struct spdk_json_object_decoder rpc_construct_split_decoders[] = {
}; };
static void static void
spdk_rpc_construct_split_vbdev(struct spdk_jsonrpc_request *request, spdk_rpc_bdev_split_create(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_construct_split req = {}; struct rpc_construct_split req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -102,7 +102,8 @@ spdk_rpc_construct_split_vbdev(struct spdk_jsonrpc_request *request,
out: out:
free(req.base_bdev); free(req.base_bdev);
} }
SPDK_RPC_REGISTER("construct_split_vbdev", spdk_rpc_construct_split_vbdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_split_create", spdk_rpc_bdev_split_create, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_split_create, construct_split_vbdev)
struct rpc_destruct_split { struct rpc_destruct_split {
char *base_bdev; char *base_bdev;

4
scripts/config_converter.py
View File

@ -8,7 +8,7 @@ from collections import OrderedDict
bdev_dict = OrderedDict() bdev_dict = OrderedDict()
bdev_dict["set_bdev_options"] = [] bdev_dict["set_bdev_options"] = []
bdev_dict["construct_split_vbdev"] = [] bdev_dict["bdev_split_create"] = []
bdev_dict["bdev_nvme_set_options"] = [] bdev_dict["bdev_nvme_set_options"] = []
bdev_dict["bdev_nvme_attach_controller"] = [] bdev_dict["bdev_nvme_attach_controller"] = []
bdev_dict["bdev_nvme_set_hotplug"] = [] bdev_dict["bdev_nvme_set_hotplug"] = []
@ -285,7 +285,7 @@ def get_split_bdev_json(config, section):
"split_size_mb": split_size_mb, "split_size_mb": split_size_mb,
"split_count": split_count "split_count": split_count
}, },
"method": "construct_split_vbdev" "method": "bdev_split_create"
}) })
return split_json return split_json

15
scripts/rpc.py
View File

@ -1360,20 +1360,21 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
p.set_defaults(func=destroy_raid_bdev) p.set_defaults(func=destroy_raid_bdev)
# split # split
def construct_split_vbdev(args): def bdev_split_create(args):
print_array(rpc.bdev.construct_split_vbdev(args.client, print_array(rpc.bdev.bdev_split_create(args.client,
base_bdev=args.base_bdev, base_bdev=args.base_bdev,
split_count=args.split_count, split_count=args.split_count,
split_size_mb=args.split_size_mb)) split_size_mb=args.split_size_mb))
p = subparsers.add_parser('construct_split_vbdev', help="""Add given disk name to split config. If bdev with base_name p = subparsers.add_parser('bdev_split_create', aliases=['construct_split_vbdev'],
help="""Add given disk name to split config. If bdev with base_name
name exist the split bdevs will be created right away, if not split bdevs will be created when base bdev became name exist the split bdevs will be created right away, if not split bdevs will be created when base bdev became
available (during examination process).""") available (during examination process).""")
p.add_argument('base_bdev', help='base bdev name') p.add_argument('base_bdev', help='base bdev name')
p.add_argument('-s', '--split-size-mb', help='size in MiB for each bdev', type=int, default=0) p.add_argument('-s', '--split-size-mb', help='size in MiB for each bdev', type=int, default=0)
p.add_argument('split_count', help="""Optional - number of split bdevs to create. Total size * split_count must not p.add_argument('split_count', help="""Optional - number of split bdevs to create. Total size * split_count must not
exceed the base bdev size.""", type=int) exceed the base bdev size.""", type=int)
p.set_defaults(func=construct_split_vbdev) p.set_defaults(func=bdev_split_create)
def destruct_split_vbdev(args): def destruct_split_vbdev(args):
rpc.bdev.destruct_split_vbdev(args.client, rpc.bdev.destruct_split_vbdev(args.client,

7
scripts/rpc/bdev.py
View File

@ -640,8 +640,9 @@ def bdev_passthru_delete(client, name):
return client.call('bdev_passthru_delete', params) return client.call('bdev_passthru_delete', params)
def construct_split_vbdev(client, base_bdev, split_count, split_size_mb=None): @deprecated_alias('construct_split_vbdev')
"""Construct split block devices from a base bdev. def bdev_split_create(client, base_bdev, split_count, split_size_mb=None):
"""Create split block devices from a base bdev.
Args: Args:
base_bdev: name of bdev to split base_bdev: name of bdev to split
@ -658,7 +659,7 @@ def construct_split_vbdev(client, base_bdev, split_count, split_size_mb=None):
if split_size_mb: if split_size_mb:
params['split_size_mb'] = split_size_mb params['split_size_mb'] = split_size_mb
return client.call('construct_split_vbdev', params) return client.call('bdev_split_create', params)
def destruct_split_vbdev(client, base_bdev): def destruct_split_vbdev(client, base_bdev):

12
scripts/spdkcli/ui_node.py
View File

@ -45,7 +45,7 @@ class UINode(ConfigNode):
finally: finally:
if self.shell.interactive and\ if self.shell.interactive and\
command in ["create", "delete", "delete_all", "add_initiator", command in ["create", "delete", "delete_all", "add_initiator",
"allow_any_host", "split_bdev", "add_lun", "allow_any_host", "bdev_split_create", "add_lun",
"iscsi_target_node_add_pg_ig_maps", "remove_target", "add_secret", "iscsi_target_node_add_pg_ig_maps", "remove_target", "add_secret",
"destruct_split_bdev", "bdev_pmem_delete_pool", "destruct_split_bdev", "bdev_pmem_delete_pool",
"bdev_pmem_create_pool", "delete_secret_all", "bdev_pmem_create_pool", "delete_secret_all",
@ -390,9 +390,9 @@ class UISplitBdev(UIBdev):
def delete(self, name): def delete(self, name):
pass pass
def ui_command_split_bdev(self, base_bdev, split_count, split_size_mb=None): def ui_command_bdev_split_create(self, base_bdev, split_count, split_size_mb=None):
""" """
Construct split block devices from a base bdev. Create split block devices from a base bdev.
Arguments: Arguments:
base_bdev - Name of bdev to split base_bdev - Name of bdev to split
@ -403,9 +403,9 @@ class UISplitBdev(UIBdev):
split_count = self.ui_eval_param(split_count, "number", None) split_count = self.ui_eval_param(split_count, "number", None)
split_size_mb = self.ui_eval_param(split_size_mb, "number", None) split_size_mb = self.ui_eval_param(split_size_mb, "number", None)
ret_name = self.get_root().split_bdev(base_bdev=base_bdev, ret_name = self.get_root().bdev_split_create(base_bdev=base_bdev,
split_count=split_count, split_count=split_count,
split_size_mb=split_size_mb) split_size_mb=split_size_mb)
self.shell.log.info(ret_name) self.shell.log.info(ret_name)
def ui_command_destruct_split_bdev(self, base_bdev): def ui_command_destruct_split_bdev(self, base_bdev):

4
scripts/spdkcli/ui_root.py
View File

@ -117,8 +117,8 @@ class UIRoot(UINode):
return rpc.bdev.bdev_get_iostat(self.client, **kwargs) return rpc.bdev.bdev_get_iostat(self.client, **kwargs)
@verbose @verbose
def split_bdev(self, **kwargs): def bdev_split_create(self, **kwargs):
response = rpc.bdev.construct_split_vbdev(self.client, **kwargs) response = rpc.bdev.bdev_split_create(self.client, **kwargs)
return self.print_array(response) return self.print_array(response)
@verbose @verbose

2
test/config_converter/spdk_config.json
View File

@ -28,7 +28,7 @@
"split_size_mb": 0, "split_size_mb": 0,
"split_count": 8 "split_count": 8
}, },
"method": "construct_split_vbdev" "method": "bdev_split_create"
}, },
{ {
"params": { "params": {

2
test/ftl/common.sh
View File

@ -31,5 +31,5 @@ function create_nv_cache_bdev() {
# Create NVMe bdev on specified device and split it so that it has the desired size # Create NVMe bdev on specified device and split it so that it has the desired size
local nvc_bdev=$($rootdir/scripts/rpc.py bdev_nvme_attach_controller -b $name -t PCIe -a $cache_bdf) local nvc_bdev=$($rootdir/scripts/rpc.py bdev_nvme_attach_controller -b $name -t PCIe -a $cache_bdf)
$rootdir/scripts/rpc.py construct_split_vbdev $nvc_bdev -s $size 1 $rootdir/scripts/rpc.py bdev_split_create $nvc_bdev -s $size 1
} }

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

@ -76,7 +76,7 @@ if [ -z "$NO_NVME" ]; then
if [ $split_size -gt 10000 ]; then if [ $split_size -gt 10000 ]; then
split_size=10000 split_size=10000
fi fi
$rpc_py construct_split_vbdev Nvme0n1 2 -s $split_size $rpc_py bdev_split_create Nvme0n1 2 -s $split_size
$rpc_py iscsi_create_target_node Target1 Target1_alias Nvme0n1p0:0 1:2 64 -d $rpc_py iscsi_create_target_node Target1 Target1_alias Nvme0n1p0:0 1:2 64 -d
fi fi

2
test/json_config/clear_config.py
View File

@ -11,7 +11,7 @@ from rpc.client import print_dict, JSONRPCException # noqa
def get_bdev_name_key(bdev): def get_bdev_name_key(bdev):
bdev_name_key = 'name' bdev_name_key = 'name'
if 'method' in bdev and bdev['method'] == 'construct_split_vbdev': if 'method' in bdev and bdev['method'] == 'bdev_split_create':
bdev_name_key = "base_bdev" bdev_name_key = "base_bdev"
return bdev_name_key return bdev_name_key

6
test/json_config/json_config.sh
View File

@ -166,8 +166,8 @@ function create_bdev_subsystem_config() {
fi fi
fi fi
tgt_rpc construct_split_vbdev $lvol_store_base_bdev 2 tgt_rpc bdev_split_create $lvol_store_base_bdev 2
tgt_rpc construct_split_vbdev Malloc0 3 tgt_rpc bdev_split_create Malloc0 3
tgt_rpc bdev_malloc_create 8 4096 --name Malloc3 tgt_rpc bdev_malloc_create 8 4096 --name Malloc3
tgt_rpc bdev_passthru_create -b Malloc3 -p PTBdevFromMalloc3 tgt_rpc bdev_passthru_create -b Malloc3 -p PTBdevFromMalloc3
@ -279,7 +279,7 @@ function create_vhost_subsystem_config() {
timing_enter $FUNCNAME timing_enter $FUNCNAME
tgt_rpc bdev_malloc_create 64 1024 --name MallocForVhost0 tgt_rpc bdev_malloc_create 64 1024 --name MallocForVhost0
tgt_rpc construct_split_vbdev MallocForVhost0 8 tgt_rpc bdev_split_create MallocForVhost0 8
tgt_rpc construct_vhost_scsi_controller VhostScsiCtrlr0 tgt_rpc construct_vhost_scsi_controller VhostScsiCtrlr0
tgt_rpc add_vhost_scsi_lun VhostScsiCtrlr0 0 MallocForVhost0p3 tgt_rpc add_vhost_scsi_lun VhostScsiCtrlr0 0 MallocForVhost0p3

2
test/spdkcli/vhost.sh
View File

@ -34,7 +34,7 @@ $spdkcli_job "'/bdevs/aio create sample0 /tmp/sample_aio 512' 'sample0' True
trtype=$($rootdir/scripts/gen_nvme.sh --json | jq -r '.config[].params | select(.name=="Nvme0").trtype') trtype=$($rootdir/scripts/gen_nvme.sh --json | jq -r '.config[].params | select(.name=="Nvme0").trtype')
traddr=$($rootdir/scripts/gen_nvme.sh --json | jq -r '.config[].params | select(.name=="Nvme0").traddr') traddr=$($rootdir/scripts/gen_nvme.sh --json | jq -r '.config[].params | select(.name=="Nvme0").traddr')
$spdkcli_job "'/bdevs/nvme create Nvme0 $trtype $traddr' 'Nvme0' True $spdkcli_job "'/bdevs/nvme create Nvme0 $trtype $traddr' 'Nvme0' True
'/bdevs/split_disk split_bdev Nvme0n1 4' 'Nvme0n1p0' True '/bdevs/split_disk bdev_split_create Nvme0n1 4' 'Nvme0n1p0' True
" "
timing_exit spdkcli_create_bdevs_config timing_exit spdkcli_create_bdevs_config

2
test/vhost/fiotest/conf.json
View File

@ -21,7 +21,7 @@
"split_size_mb": 0, "split_size_mb": 0,
"split_count": 4 "split_count": 4
}, },
"method": "construct_split_vbdev" "method": "bdev_split_create"
}, },
{ {
"params": { "params": {

12
test/vhost/hotplug/scsi_hotplug.sh
View File

@ -63,13 +63,13 @@ notice "running SPDK"
notice "" notice ""
vhost_run 0 vhost_run 0
$rpc_py bdev_nvme_set_hotplug -e $rpc_py bdev_nvme_set_hotplug -e
$rpc_py construct_split_vbdev Nvme0n1 16 $rpc_py bdev_split_create Nvme0n1 16
$rpc_py bdev_malloc_create 128 512 -b Malloc $rpc_py bdev_malloc_create 128 512 -b Malloc
$rpc_py construct_split_vbdev Malloc 4 $rpc_py bdev_split_create Malloc 4
$rpc_py construct_split_vbdev HotInNvme0n1 2 $rpc_py bdev_split_create HotInNvme0n1 2
$rpc_py construct_split_vbdev HotInNvme1n1 2 $rpc_py bdev_split_create HotInNvme1n1 2
$rpc_py construct_split_vbdev HotInNvme2n1 2 $rpc_py bdev_split_create HotInNvme2n1 2
$rpc_py construct_split_vbdev HotInNvme3n1 2 $rpc_py bdev_split_create HotInNvme3n1 2
$rpc_py bdev_get_bdevs $rpc_py bdev_get_bdevs
if [[ $scsi_hot_remove_test == 0 ]] && [[ $blk_hot_remove_test == 0 ]]; then if [[ $scsi_hot_remove_test == 0 ]] && [[ $blk_hot_remove_test == 0 ]]; then

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

@ -63,7 +63,7 @@ function create_bdev_config()
error "Nvme0n1 bdev not found!" error "Nvme0n1 bdev not found!"
fi fi
$RPC_PY construct_split_vbdev Nvme0n1 6 $RPC_PY bdev_split_create Nvme0n1 6
$RPC_PY construct_vhost_scsi_controller naa.Nvme0n1_scsi0.0 $RPC_PY construct_vhost_scsi_controller naa.Nvme0n1_scsi0.0
$RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 0 Nvme0n1p0 $RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 0 Nvme0n1p0

2
test/vhost/perf_bench/vhost_perf.sh
View File

@ -253,7 +253,7 @@ else
trap 'cleanup_split_cfg; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR trap 'cleanup_split_cfg; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR
split_bdevs=() split_bdevs=()
for (( i=0; i<$max_disks; i++ ));do for (( i=0; i<$max_disks; i++ ));do
out=$($rpc_py construct_split_vbdev Nvme${i}n1 ${splits[$i]}) out=$($rpc_py bdev_split_create Nvme${i}n1 ${splits[$i]})
for s in $(seq 0 $((${splits[$i]}-1))); do for s in $(seq 0 $((${splits[$i]}-1))); do
split_bdevs+=("Nvme${i}n1p${s}") split_bdevs+=("Nvme${i}n1p${s}")
done done