diff --git a/CHANGELOG.md b/CHANGELOG.md index 622d43fe9..146a68f01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,8 @@ pending additional features and tests. Added new strip_size_kb rpc param on create to replace the more ambiguous strip_size. The strip_size rpc param is deprecated. +Changed the raid bdev product_name from "Pooled Device" to "Raid Volume" + ### thread Added spdk_thread_has_pollers() function to verify if there are any registered diff --git a/lib/bdev/raid/bdev_raid.c b/lib/bdev/raid/bdev_raid.c index b0c6fd61c..c969a9718 100644 --- a/lib/bdev/raid/bdev_raid.c +++ b/lib/bdev/raid/bdev_raid.c @@ -344,7 +344,7 @@ raid_bdev_submit_rw_request(struct spdk_bdev_io *bdev_io, uint64_t start_strip) * brief: * get_curr_base_bdev_index function calculates the base bdev index * params: - * raid_bdev - pointer to pooled bdev + * raid_bdev - pointer to raid bdev * raid_io - pointer to parent io context * returns: * base bdev index @@ -1561,7 +1561,7 @@ raid_bdev_create(struct raid_bdev_config *raid_cfg) 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->fn_table = &g_raid_bdev_fn_table; raid_bdev_gen->module = &g_raid_if; @@ -1695,7 +1695,7 @@ raid_bdev_configure(struct raid_bdev *raid_bdev) raid_bdev->bdev.name); rc = spdk_bdev_register(raid_bdev_gen); 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); raid_bdev->state = RAID_BDEV_STATE_CONFIGURING; return rc; diff --git a/lib/bdev/raid/bdev_raid.h b/lib/bdev/raid/bdev_raid.h index 36b396ac4..1963fdbeb 100644 --- a/lib/bdev/raid/bdev_raid.h +++ b/lib/bdev/raid/bdev_raid.h @@ -131,7 +131,7 @@ struct raid_bdev { /* * 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 { /* WaitQ entry, used only in waitq logic */ diff --git a/scripts/rpc/bdev.py b/scripts/rpc/bdev.py index dcbf9b1ff..aa6a1aa55 100644 --- a/scripts/rpc/bdev.py +++ b/scripts/rpc/bdev.py @@ -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): - """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: 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): - """Destroy pooled device + """Destroy raid bdev Args: name: raid bdev name diff --git a/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c index f9889e602..cd9179dff 100644 --- a/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c +++ b/test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c @@ -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 / 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.blocklen == g_block_len); if (pbdev->num_base_bdevs > 1) {