Re: [PATCH v2 01/10] assign SCRATCH_DEV_POOL to an array

Filipe Manana
2024-02-20T16:18:25Z

On Mon, Feb 19, 2024 at 7:49 PM Anand Jain <anand.jain@oracle.com> wrote:
>
> Many test cases use local variables to manage the names of each device in
> SCRATCH_DEV_POOL. Let _scratch_dev_pool_get set an array, SCRATCH_DEV_NAME,
> for it.
>
> Usage:
>
> _scratch_dev_pool_get <n>
>
> # device names are in the array SCRATCH_DEV_NAME.
> ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]} ...
>
> _scratch_dev_pool_put
>
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
> v2:
> Fix typo in the commit log.
> Fix array SCRATCH_DEV_POOL_SAVED handling.
>
> common/rc | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index 524ffa02aa6a..5d249af3df37 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -830,6 +830,8 @@ _spare_dev_put()
> # required number of scratch devices by a-test-case excluding
> # the replace-target and spare device. So this function will
> # set SCRATCH_DEV_POOL to the specified number of devices.
> +# Also, this functions assigns array SCRATCH_DEV_NAME to the
> +# array SCRATCH_DEV_POOL.

I'm not a native English speaker, but when it's phrased like that it
gives the idea of:

SCRATCH_DEV_POOL = SCRATCH_DEV_NAME

Maybe a "Sets a SCRATCH_DEV_NAME array with the names of the devices."

But anyway:

Reviewed-by: Filipe Manana <fdmanana@suse.com>

> #
> # Usage:
> # _scratch_dev_pool_get() <ndevs>
> @@ -860,19 +862,28 @@ _scratch_dev_pool_get()
> export SCRATCH_DEV_POOL_SAVED
> SCRATCH_DEV_POOL=${devs[@]:0:$test_ndevs}
> export SCRATCH_DEV_POOL
> + SCRATCH_DEV_NAME=( $SCRATCH_DEV_POOL )
> + export SCRATCH_DEV_NAME
> }
>
> _scratch_dev_pool_put()
> {
> + local ret1
> + local ret2
> +
> typeset -p SCRATCH_DEV_POOL_SAVED >/dev/null 2>&1
> - if [ $? -ne 0 ]; then
> + ret1=$?
> + typeset -p SCRATCH_DEV_NAME >/dev/null 2>&1
> + ret2=$?
> + if [[ $ret1 -ne 0 || $ret2 -ne 0 ]]; then
> _fail "Bug: unset val, must call _scratch_dev_pool_get before _scratch_dev_pool_put"
> fi
>
> - if [ -z "$SCRATCH_DEV_POOL_SAVED" ]; then
> + if [[ -z "$SCRATCH_DEV_POOL_SAVED" || -z "${SCRATCH_DEV_NAME[@]}" ]]; then
> _fail "Bug: str empty, must call _scratch_dev_pool_get before _scratch_dev_pool_put"
> fi
>
> + export SCRATCH_DEV_NAME=()
> export SCRATCH_DEV_POOL=$SCRATCH_DEV_POOL_SAVED
> export SCRATCH_DEV_POOL_SAVED=""
> }
> --
> 2.39.3
>