Commit a6524cd1 authored by Mike Carlin's avatar Mike Carlin Committed by Darek Stojaczyk
Browse files

raid bdev: Change product_name to "Raid Volume" 



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: default avatarMike Carlin <mikefcarlin@protonmail.com>
Change-Id: I9092a2b793e48bb9ec0349087a31fdcde17ed9cd
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452269


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent eba7fce3

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -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

lib/bdev/raid/bdev_raid.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

lib/bdev/raid/bdev_raid.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

scripts/rpc/bdev.py

+2 −2
Original line number Diff line number Diff line
@@ -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

test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {