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

raid bdev: Change product_name to "Raid Volume"

Browse Source 
The product_name for raid bdevs was "Pooled Device" which was a legacy
naming convention that hadn't been cleaned up yet. This changes the
naming to be up to date with the current naming scheme.

Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com>
Change-Id: I9092a2b793e48bb9ec0349087a31fdcde17ed9cd
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452269
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Mike Carlin 2019-04-26 15:30:49 -07:00 committed by Darek Stojaczyk
parent eba7fce38f
commit a6524cd1f8
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -42,6 +42,8 @@ pending additional features and tests.
Added new strip_size_kb rpc param on create to replace the more ambiguous Added new strip_size_kb rpc param on create to replace the more ambiguous
strip_size. The strip_size rpc param is deprecated. strip_size. The strip_size rpc param is deprecated.
Changed the raid bdev product_name from "Pooled Device" to "Raid Volume"
### thread ### thread
Added spdk_thread_has_pollers() function to verify if there are any registered Added spdk_thread_has_pollers() function to verify if there are any registered

6
lib/bdev/raid/bdev_raid.c
View File

@ -344,7 +344,7 @@ raid_bdev_submit_rw_request(struct spdk_bdev_io *bdev_io, uint64_t start_strip)
* brief: * brief:
* get_curr_base_bdev_index function calculates the base bdev index * get_curr_base_bdev_index function calculates the base bdev index
* params: * params:
* raid_bdev - pointer to pooled bdev * raid_bdev - pointer to raid bdev
* raid_io - pointer to parent io context * raid_io - pointer to parent io context
* returns: * returns:
* base bdev index * base bdev index
@ -1561,7 +1561,7 @@ raid_bdev_create(struct raid_bdev_config *raid_cfg)
return -ENOMEM; return -ENOMEM;
} }
raid_bdev_gen->product_name = "Pooled Device"; raid_bdev_gen->product_name = "Raid Volume";
raid_bdev_gen->ctxt = raid_bdev; raid_bdev_gen->ctxt = raid_bdev;
raid_bdev_gen->fn_table = &g_raid_bdev_fn_table; raid_bdev_gen->fn_table = &g_raid_bdev_fn_table;
raid_bdev_gen->module = &g_raid_if; raid_bdev_gen->module = &g_raid_if;
@ -1695,7 +1695,7 @@ raid_bdev_configure(struct raid_bdev *raid_bdev)
raid_bdev->bdev.name); raid_bdev->bdev.name);
rc = spdk_bdev_register(raid_bdev_gen); rc = spdk_bdev_register(raid_bdev_gen);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Unable to register pooled bdev and stay at configuring state\n"); SPDK_ERRLOG("Unable to register raid bdev and stay at configuring state\n");
spdk_io_device_unregister(raid_bdev, NULL); spdk_io_device_unregister(raid_bdev, NULL);
raid_bdev->state = RAID_BDEV_STATE_CONFIGURING; raid_bdev->state = RAID_BDEV_STATE_CONFIGURING;
return rc; return rc;

2
lib/bdev/raid/bdev_raid.h
View File

@ -131,7 +131,7 @@ struct raid_bdev {
/* /*
* raid_bdev_io is the context part of bdev_io. It contains the information * raid_bdev_io is the context part of bdev_io. It contains the information
* related to bdev_io for a pooled bdev * related to bdev_io for a raid bdev
*/ */
struct raid_bdev_io { struct raid_bdev_io {
/* WaitQ entry, used only in waitq logic */ /* WaitQ entry, used only in waitq logic */

4
scripts/rpc/bdev.py
View File

@ -199,7 +199,7 @@ def get_raid_bdevs(client, category):
def construct_raid_bdev(client, name, raid_level, base_bdevs, strip_size=None, strip_size_kb=None): def construct_raid_bdev(client, name, raid_level, base_bdevs, strip_size=None, strip_size_kb=None):
"""Construct pooled device. Either strip size arg will work but one is required. """Construct raid bdev. Either strip size arg will work but one is required.
Args: Args:
name: user defined raid bdev name name: user defined raid bdev name
@ -223,7 +223,7 @@ def construct_raid_bdev(client, name, raid_level, base_bdevs, strip_size=None, s
def destroy_raid_bdev(client, name): def destroy_raid_bdev(client, name):
"""Destroy pooled device """Destroy raid bdev
Args: Args:
name: raid bdev name name: raid bdev name

2
test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c
View File

@ -1100,7 +1100,7 @@ verify_raid_bdev(struct rpc_construct_raid_bdev *r, bool presence, uint32_t raid
} }
CU_ASSERT((((min_blockcnt / (r->strip_size_kb * 1024 / g_block_len)) * (r->strip_size_kb * 1024 / CU_ASSERT((((min_blockcnt / (r->strip_size_kb * 1024 / g_block_len)) * (r->strip_size_kb * 1024 /
g_block_len)) * r->base_bdevs.num_base_bdevs) == pbdev->bdev.blockcnt); g_block_len)) * r->base_bdevs.num_base_bdevs) == pbdev->bdev.blockcnt);
CU_ASSERT(strcmp(pbdev->bdev.product_name, "Pooled Device") == 0); CU_ASSERT(strcmp(pbdev->bdev.product_name, "Raid Volume") == 0);
CU_ASSERT(pbdev->bdev.write_cache == 0); CU_ASSERT(pbdev->bdev.write_cache == 0);
CU_ASSERT(pbdev->bdev.blocklen == g_block_len); CU_ASSERT(pbdev->bdev.blocklen == g_block_len);
if (pbdev->num_base_bdevs > 1) { if (pbdev->num_base_bdevs > 1) {