c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-01-25 10:12:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'zpool add' safety check corner cases

Browse Source 
Three cases were discovered where 'zpool add' would fail to
warn when adding vdevs to a pool with a mismatched replication
level.  These are:

  1. When a pool contains mixed file and disk vdevs.
  2. When a pool contains an active dRAID distributed spare
  3. When a pool contains an active hot spare

The lack of warnings are caused by get_replication() assessing
the current pool configuration an inconsistent and disabling
the mismatched replication check for the new pool configuration
after 'zpool add'.  This change updates get_replication() to
be slightly more tolerant in the non-fatal case.

The zpool_add_010_pos.ksh test case was split in to separate
tests: zpool_add_warn_create.ksh, pool_add_warn_degraded.ksh,
and zpool_add_warn_removal.  These test were extended to
include coverage for dRAID pools and the three scenarios
described above.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #17780
This commit is contained in:
Brian Behlendorf 2025-09-25 09:32:59 -07:00
parent 9bd8f4379c
commit d33d0cac5a
7 changed files with 418 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/zpool/zpool_vdev.c
View File

@ -609,22 +609,28 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
ZPOOL_CONFIG_PATH, &path) == 0); ZPOOL_CONFIG_PATH, &path) == 0);
/* /*
* If we have a raidz/mirror that combines disks * Skip active spares they should never cause
* with files, report it as an error. * the pool to be evaluated as inconsistent.
*/ */
if (!dontreport && type != NULL && if (is_spare(NULL, path))
continue;
/*
* If we have a raidz/mirror that combines disks
* with files, only report it as an error when
* fatal is set to ensure all the replication
* checks aren't skipped in check_replication().
*/
if (fatal && !dontreport && type != NULL &&
strcmp(type, childtype) != 0) { strcmp(type, childtype) != 0) {
if (ret != NULL) if (ret != NULL)
free(ret); free(ret);
ret = NULL; ret = NULL;
if (fatal) vdev_error(gettext(
vdev_error(gettext( "mismatched replication "
"mismatched replication " "level: %s contains both "
"level: %s contains both " "files and devices\n"),
"files and devices\n"), rep.zprl_type);
rep.zprl_type);
else
return (NULL);
dontreport = B_TRUE; dontreport = B_TRUE;
} }

5
tests/runfiles/common.run
View File

@ -395,8 +395,9 @@ tags = ['functional', 'cli_root', 'zpool']
[tests/functional/cli_root/zpool_add] [tests/functional/cli_root/zpool_add]
tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos', tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos',
'zpool_add_004_pos', 'zpool_add_006_pos', 'zpool_add_007_neg', 'zpool_add_004_pos', 'zpool_add_006_pos', 'zpool_add_007_neg',
'zpool_add_008_neg', 'zpool_add_009_neg', 'zpool_add_010_pos', 'zpool_add_008_neg', 'zpool_add_009_neg', 'zpool_add_warn_create',
'add-o_ashift', 'add_prop_ashift', 'zpool_add_dryrun_output'] 'zpool_add_warn_degraded', 'zpool_add_warn_removal', 'add-o_ashift',
'add_prop_ashift', 'zpool_add_dryrun_output']
tags = ['functional', 'cli_root', 'zpool_add'] tags = ['functional', 'cli_root', 'zpool_add']
[tests/functional/cli_root/zpool_attach] [tests/functional/cli_root/zpool_attach]

4
tests/zfs-tests/tests/Makefile.am
View File

@ -1027,7 +1027,9 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
functional/cli_root/zpool_add/zpool_add_007_neg.ksh \ functional/cli_root/zpool_add/zpool_add_007_neg.ksh \
functional/cli_root/zpool_add/zpool_add_008_neg.ksh \ functional/cli_root/zpool_add/zpool_add_008_neg.ksh \
functional/cli_root/zpool_add/zpool_add_009_neg.ksh \ functional/cli_root/zpool_add/zpool_add_009_neg.ksh \
functional/cli_root/zpool_add/zpool_add_010_pos.ksh \ functional/cli_root/zpool_add/zpool_add_warn_create.ksh \
functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh \
functional/cli_root/zpool_add/zpool_add_warn_removal.ksh \
functional/cli_root/zpool_add/zpool_add_dryrun_output.ksh \ functional/cli_root/zpool_add/zpool_add_dryrun_output.ksh \
functional/cli_root/zpool_attach/attach-o_ashift.ksh \ functional/cli_root/zpool_attach/attach-o_ashift.ksh \
functional/cli_root/zpool_attach/cleanup.ksh \ functional/cli_root/zpool_attach/cleanup.ksh \

42
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
View File

@ -27,6 +27,7 @@
# #
# Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright (c) 2012, 2016 by Delphix. All rights reserved.
# Copyright 2025 by Lawrence Livermore National Security, LLC.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
@ -89,3 +90,44 @@ function save_dump_dev
fi fi
echo $dumpdev echo $dumpdev
} }
function zpool_create_add_setup
{
typeset -i i=0
while ((i < 10)); do
log_must truncate -s $MINVDEVSIZE $TEST_BASE_DIR/vdev$i
eval vdev$i=$TEST_BASE_DIR/vdev$i
((i += 1))
done
if is_linux; then
vdev_lo="$(losetup -f "$vdev4" --show)"
elif is_freebsd; then
vdev_lo=/dev/"$(mdconfig -a -t vnode -f "$vdev4")"
else
vdev_lo="$(lofiadm -a "$vdev4")"
fi
}
function zpool_create_add_cleanup
{
datasetexists $TESTPOOL1 && destroy_pool $TESTPOOL1
if [[ -e $vdev_lo ]]; then
if is_linux; then
log_must losetup -d "$vdev_lo"
elif is_freebsd; then
log_must mdconfig -d -u "$vdev_lo"
else
log_must lofiadm -d "$vdev_lo"
fi
fi
typeset -i i=0
while ((i < 10)); do
rm -f $TEST_BASE_DIR/vdev$i
((i += 1))
done
}

101
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_010_pos.ksh → tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_create.ksh
View File

@ -23,67 +23,51 @@
# #
# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms. # Copyright 2012, 2016 by Delphix. All rights reserved.
# # Copyright 2025 by Lawrence Livermore National Security, LLC.
#
# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/cli_root/zpool_create/zpool_create.shlib . $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
# #
# DESCRIPTION: # DESCRIPTION:
# Verify zpool add succeed when adding vdevs with matching redundancy. # Verify zpool add succeeds when adding vdevs with matching redundancy
# and warns with differing redundancy for a healthy pool.
# #
# STRATEGY: # STRATEGY:
# 1. Create several files == $MINVDEVSIZE. # 1. Create several files == $MINVDEVSIZE.
# 2. Verify 'zpool add' succeeds with matching redundancy. # 2. Verify 'zpool add' succeeds with matching redundancy.
# 3. Verify 'zpool add' warns with differing redundancy. # 3. Verify 'zpool add' warns with differing redundancy.
# 4. Verify 'zpool add' warns with differing redundancy after removal.
# #
verify_runnable "global" verify_runnable "global"
function cleanup log_assert "Verify 'zpool add' warns for differing redundancy."
{ log_onexit zpool_create_add_cleanup
datasetexists $TESTPOOL1 && destroy_pool $TESTPOOL1
typeset -i i=0 zpool_create_add_setup
while ((i < 10)); do
rm -f $TEST_BASE_DIR/vdev$i
((i += 1))
done
}
log_assert "Verify 'zpool add' succeed with keywords combination."
log_onexit cleanup
# 1. Create several files == $MINVDEVSIZE.
typeset -i i=0 typeset -i i=0
while ((i < 10)); do typeset -i j=0
log_must truncate -s $MINVDEVSIZE $TEST_BASE_DIR/vdev$i
eval vdev$i=$TEST_BASE_DIR/vdev$i
((i += 1))
done
set -A redundancy0_create_args \ set -A redundancy0_create_args \
"$vdev0" "$vdev0"
set -A redundancy1_create_args \ set -A redundancy1_create_args \
"mirror $vdev0 $vdev1" \ "mirror $vdev0 $vdev1" \
"raidz1 $vdev0 $vdev1" "raidz1 $vdev0 $vdev1" \
"draid1:1s $vdev0 $vdev1 $vdev9"
set -A redundancy2_create_args \ set -A redundancy2_create_args \
"mirror $vdev0 $vdev1 $vdev2" \ "mirror $vdev0 $vdev1 $vdev2" \
"raidz2 $vdev0 $vdev1 $vdev2" "raidz2 $vdev0 $vdev1 $vdev2" \
"draid2:1s $vdev0 $vdev1 $vdev2 $vdev9"
set -A redundancy3_create_args \ set -A redundancy3_create_args \
"mirror $vdev0 $vdev1 $vdev2 $vdev3" \ "mirror $vdev0 $vdev1 $vdev2 $vdev3" \
"raidz3 $vdev0 $vdev1 $vdev2 $vdev3" "raidz3 $vdev0 $vdev1 $vdev2 $vdev3" \
"draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9"
set -A redundancy0_add_args \ set -A redundancy0_add_args \
"$vdev5" \ "$vdev5" \
@ -93,21 +77,19 @@ set -A redundancy1_add_args \
"mirror $vdev5 $vdev6" \ "mirror $vdev5 $vdev6" \
"raidz1 $vdev5 $vdev6" \ "raidz1 $vdev5 $vdev6" \
"raidz1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \ "raidz1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \
"mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" "mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" \
"draid1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \
"mirror $vdev5 $vdev6 draid1 $vdev7 $vdev8"
set -A redundancy2_add_args \ set -A redundancy2_add_args \
"mirror $vdev5 $vdev6 $vdev7" \ "mirror $vdev5 $vdev6 $vdev7" \
"raidz2 $vdev5 $vdev6 $vdev7" "raidz2 $vdev5 $vdev6 $vdev7" \
"draid2 $vdev5 $vdev6 $vdev7"
set -A redundancy3_add_args \ set -A redundancy3_add_args \
"mirror $vdev5 $vdev6 $vdev7 $vdev8" \ "mirror $vdev5 $vdev6 $vdev7 $vdev8" \
"raidz3 $vdev5 $vdev6 $vdev7 $vdev8" "raidz3 $vdev5 $vdev6 $vdev7 $vdev8" \
"draid3 $vdev5 $vdev6 $vdev7 $vdev8"
set -A log_args "log" "$vdev4"
set -A cache_args "cache" "$vdev4"
set -A spare_args "spare" "$vdev4"
typeset -i j=0
function zpool_create_add function zpool_create_add
{ {
@ -148,30 +130,6 @@ function zpool_create_forced_add
done done
} }
function zpool_create_rm_add
{
typeset -n create_args=$1
typeset -n add_args=$2
typeset -n rm_args=$3
i=0
while ((i < ${#create_args[@]})); do
j=0
while ((j < ${#add_args[@]})); do
log_must zpool create $TESTPOOL1 ${create_args[$i]}
log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]}
log_must zpool add $TESTPOOL1 ${add_args[$j]}
log_must zpool remove $TESTPOOL1 ${rm_args[1]}
log_mustnot zpool add $TESTPOOL1 ${rm_args[1]}
log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]}
log_must zpool destroy -f $TESTPOOL1
((j += 1))
done
((i += 1))
done
}
# 2. Verify 'zpool add' succeeds with matching redundancy. # 2. Verify 'zpool add' succeeds with matching redundancy.
zpool_create_add redundancy0_create_args redundancy0_add_args zpool_create_add redundancy0_create_args redundancy0_add_args
zpool_create_add redundancy1_create_args redundancy1_add_args zpool_create_add redundancy1_create_args redundancy1_add_args
@ -195,17 +153,4 @@ zpool_create_forced_add redundancy3_create_args redundancy0_add_args
zpool_create_forced_add redundancy3_create_args redundancy1_add_args zpool_create_forced_add redundancy3_create_args redundancy1_add_args
zpool_create_forced_add redundancy3_create_args redundancy2_add_args zpool_create_forced_add redundancy3_create_args redundancy2_add_args
# 4. Verify 'zpool add' warns with differing redundancy after removal. log_pass "Verify 'zpool add' warns for differing redundancy."
zpool_create_rm_add redundancy1_create_args redundancy1_add_args log_args
zpool_create_rm_add redundancy2_create_args redundancy2_add_args log_args
zpool_create_rm_add redundancy3_create_args redundancy3_add_args log_args
zpool_create_rm_add redundancy1_create_args redundancy1_add_args cache_args
zpool_create_rm_add redundancy2_create_args redundancy2_add_args cache_args
zpool_create_rm_add redundancy3_create_args redundancy3_add_args cache_args
zpool_create_rm_add redundancy1_create_args redundancy1_add_args spare_args
zpool_create_rm_add redundancy2_create_args redundancy2_add_args spare_args
zpool_create_rm_add redundancy3_create_args redundancy3_add_args spare_args
log_pass "'zpool add' succeed with keywords combination."

204
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh Executable file
View File

@ -0,0 +1,204 @@
#!/bin/ksh -p
# SPDX-License-Identifier: CDDL-1.0
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or https://opensource.org/licenses/CDDL-1.0.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Copyright 2012, 2016 by Delphix. All rights reserved.
# Copyright 2025 by Lawrence Livermore National Security, LLC.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
#
# DESCRIPTION:
# Verify zpool add succeeds when adding vdevs with matching redundancy
# and warns with differing redundancy for a degraded pool.
#
# STRATEGY:
# 1. Create several files == $MINVDEVSIZE.
# 2. Verify 'zpool add' succeeds with matching redundancy
# 3. Verify 'zpool add' warns with differing redundancy when
# a. Degraded pool with replaced mismatch vdev (file vs disk)
# b. Degraded pool dRAID distributed spare active
# c. Degraded pool hot spare active
#
verify_runnable "global"
log_assert "Verify 'zpool add' warns for differing redundancy."
log_onexit zpool_create_add_cleanup
zpool_create_add_setup
set -A redundancy1_create_args \
"mirror $vdev0 $vdev1" \
"raidz1 $vdev0 $vdev1" \
"draid1:1s $vdev0 $vdev1 $vdev9"
set -A redundancy2_create_args \
"mirror $vdev0 $vdev1 $vdev2" \
"raidz2 $vdev0 $vdev1 $vdev2" \
"draid2:1s $vdev0 $vdev1 $vdev2 $vdev9"
set -A redundancy3_create_args \
"mirror $vdev0 $vdev1 $vdev2 $vdev3" \
"raidz3 $vdev0 $vdev1 $vdev2 $vdev3" \
"draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9"
set -A redundancy1_add_args \
"mirror $vdev5 $vdev6" \
"raidz1 $vdev5 $vdev6" \
"raidz1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \
"mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" \
"draid1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \
"mirror $vdev5 $vdev6 draid1 $vdev7 $vdev8"
set -A redundancy2_add_args \
"mirror $vdev5 $vdev6 $vdev7" \
"raidz2 $vdev5 $vdev6 $vdev7" \
"draid2 $vdev5 $vdev6 $vdev7"
set -A redundancy3_add_args \
"mirror $vdev5 $vdev6 $vdev7 $vdev8" \
"raidz3 $vdev5 $vdev6 $vdev7 $vdev8" \
"draid3 $vdev5 $vdev6 $vdev7 $vdev8"
set -A redundancy1_create_draid_args \
"draid1:1s $vdev0 $vdev1 $vdev2"
set -A redundancy2_create_draid_args \
"draid2:1s $vdev0 $vdev1 $vdev2 $vdev3"
set -A redundancy3_create_draid_args \
"draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9"
set -A redundancy1_create_spare_args \
"mirror $vdev0 $vdev1 spare $vdev_lo" \
"raidz1 $vdev0 $vdev1 spare $vdev_lo" \
"draid1 $vdev0 $vdev1 spare $vdev_lo"
set -A redundancy2_create_spare_args \
"mirror $vdev0 $vdev1 $vdev2 spare $vdev_lo" \
"raidz2 $vdev0 $vdev1 $vdev2 spare $vdev_lo" \
"draid2 $vdev0 $vdev1 $vdev2 spare $vdev_lo"
set -A redundancy3_create_spare_args \
"mirror $vdev0 $vdev1 $vdev2 $vdev3 spare $vdev_lo" \
"raidz3 $vdev0 $vdev1 $vdev2 $vdev3 spare $vdev_lo" \
"draid3 $vdev0 $vdev1 $vdev2 $vdev3 spare $vdev_lo"
set -A replace_args "$vdev1" "$vdev_lo"
set -A draid1_args "$vdev1" "draid1-0-0"
set -A draid2_args "$vdev1" "draid2-0-0"
set -A draid3_args "$vdev1" "draid3-0-0"
typeset -i i=0
typeset -i j=0
function zpool_create_degraded_add
{
typeset -n create_args=$1
typeset -n add_args=$2
typeset -n rm_args=$3
i=0
while ((i < ${#create_args[@]})); do
j=0
while ((j < ${#add_args[@]})); do
log_must zpool create $TESTPOOL1 ${create_args[$i]}
log_must zpool offline -f $TESTPOOL1 ${rm_args[0]}
log_must zpool replace -w $TESTPOOL1 ${rm_args[0]} ${rm_args[1]}
log_must zpool add $TESTPOOL1 ${add_args[$j]}
log_must zpool destroy -f $TESTPOOL1
log_must zpool labelclear -f ${rm_args[0]}
((j += 1))
done
((i += 1))
done
}
function zpool_create_forced_degraded_add
{
typeset -n create_args=$1
typeset -n add_args=$2
typeset -n rm_args=$3
i=0
while ((i < ${#create_args[@]})); do
j=0
while ((j < ${#add_args[@]})); do
log_must zpool create $TESTPOOL1 ${create_args[$i]}
log_must zpool offline -f $TESTPOOL1 ${rm_args[0]}
log_must zpool replace -w $TESTPOOL1 ${rm_args[0]} ${rm_args[1]}
log_mustnot zpool add $TESTPOOL1 ${add_args[$j]}
log_must zpool add --allow-replication-mismatch $TESTPOOL1 ${add_args[$j]}
log_must zpool destroy -f $TESTPOOL1
log_must zpool labelclear -f ${rm_args[0]}
((j += 1))
done
((i += 1))
done
}
# 2. Verify 'zpool add' succeeds with matching redundancy and a degraded pool.
zpool_create_degraded_add redundancy1_create_args redundancy1_add_args replace_args
zpool_create_degraded_add redundancy2_create_args redundancy2_add_args replace_args
zpool_create_degraded_add redundancy3_create_args redundancy3_add_args replace_args
# 3. Verify 'zpool add' warns with differing redundancy and a degraded pool.
#
# a. Degraded pool with replaced mismatch vdev (file vs disk)
zpool_create_forced_degraded_add redundancy1_create_args redundancy2_add_args replace_args
zpool_create_forced_degraded_add redundancy1_create_args redundancy3_add_args replace_args
zpool_create_forced_degraded_add redundancy2_create_args redundancy1_add_args replace_args
zpool_create_forced_degraded_add redundancy2_create_args redundancy3_add_args replace_args
zpool_create_forced_degraded_add redundancy3_create_args redundancy1_add_args replace_args
zpool_create_forced_degraded_add redundancy3_create_args redundancy2_add_args replace_args
# b. Degraded pool dRAID distributed spare active
zpool_create_forced_degraded_add redundancy1_create_draid_args redundancy2_add_args draid1_args
zpool_create_forced_degraded_add redundancy1_create_draid_args redundancy3_add_args draid1_args
zpool_create_forced_degraded_add redundancy2_create_draid_args redundancy1_add_args draid2_args
zpool_create_forced_degraded_add redundancy2_create_draid_args redundancy3_add_args draid2_args
zpool_create_forced_degraded_add redundancy3_create_draid_args redundancy1_add_args draid3_args
zpool_create_forced_degraded_add redundancy3_create_draid_args redundancy2_add_args draid3_args
# c. Degraded pool hot spare active
zpool_create_forced_degraded_add redundancy1_create_spare_args redundancy2_add_args replace_args
zpool_create_forced_degraded_add redundancy1_create_spare_args redundancy3_add_args replace_args
zpool_create_forced_degraded_add redundancy2_create_spare_args redundancy1_add_args replace_args
zpool_create_forced_degraded_add redundancy2_create_spare_args redundancy3_add_args replace_args
zpool_create_forced_degraded_add redundancy3_create_spare_args redundancy1_add_args replace_args
zpool_create_forced_degraded_add redundancy3_create_spare_args redundancy2_add_args replace_args
log_pass "Verify 'zpool add' warns for differing redundancy."

126
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh Executable file
View File

@ -0,0 +1,126 @@
#!/bin/ksh -p
# SPDX-License-Identifier: CDDL-1.0
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or https://opensource.org/licenses/CDDL-1.0.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Copyright 2012, 2016 by Delphix. All rights reserved.
# Copyright 2025 by Lawrence Livermore National Security, LLC.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib
#
# DESCRIPTION:
# Verify zpool add succeeds when adding vdevs with matching redundancy
# and warns with differing redundancy after removal.
#
# STRATEGY:
# 1. Create several files == $MINVDEVSIZE.
# 2. Verify 'zpool add' warns with differing redundancy after removal.
#
verify_runnable "global"
log_assert "Verify 'zpool add' warns for differing redundancy."
log_onexit zpool_create_add_cleanup
zpool_create_add_setup
typeset -i i=0
typeset -i j=0
set -A redundancy1_create_args \
"mirror $vdev0 $vdev1" \
"raidz1 $vdev0 $vdev1" \
"draid1:1s $vdev0 $vdev1 $vdev9"
set -A redundancy2_create_args \
"mirror $vdev0 $vdev1 $vdev2" \
"raidz2 $vdev0 $vdev1 $vdev2" \
"draid2:1s $vdev0 $vdev1 $vdev2 $vdev9"
set -A redundancy3_create_args \
"mirror $vdev0 $vdev1 $vdev2 $vdev3" \
"raidz3 $vdev0 $vdev1 $vdev2 $vdev3" \
"draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9"
set -A redundancy1_add_args \
"mirror $vdev5 $vdev6" \
"raidz1 $vdev5 $vdev6" \
"raidz1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \
"mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" \
"draid1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \
"mirror $vdev5 $vdev6 draid1 $vdev7 $vdev8"
set -A redundancy2_add_args \
"mirror $vdev5 $vdev6 $vdev7" \
"raidz2 $vdev5 $vdev6 $vdev7" \
"draid2 $vdev5 $vdev6 $vdev7"
set -A redundancy3_add_args \
"mirror $vdev5 $vdev6 $vdev7 $vdev8" \
"raidz3 $vdev5 $vdev6 $vdev7 $vdev8" \
"draid3 $vdev5 $vdev6 $vdev7 $vdev8"
set -A log_args "log" "$vdev_lo"
set -A cache_args "cache" "$vdev_lo"
set -A spare_args "spare" "$vdev_lo"
function zpool_create_rm_add
{
typeset -n create_args=$1
typeset -n add_args=$2
typeset -n rm_args=$3
i=0
while ((i < ${#create_args[@]})); do
j=0
while ((j < ${#add_args[@]})); do
log_must zpool create $TESTPOOL1 ${create_args[$i]}
log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]}
log_must zpool add $TESTPOOL1 ${add_args[$j]}
log_must zpool remove $TESTPOOL1 ${rm_args[1]}
log_mustnot zpool add $TESTPOOL1 ${rm_args[1]}
log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]}
log_must zpool destroy -f $TESTPOOL1
((j += 1))
done
((i += 1))
done
}
# 2. Verify 'zpool add' warns with differing redundancy after removal.
zpool_create_rm_add redundancy1_create_args redundancy1_add_args log_args
zpool_create_rm_add redundancy2_create_args redundancy2_add_args log_args
zpool_create_rm_add redundancy3_create_args redundancy3_add_args log_args
zpool_create_rm_add redundancy1_create_args redundancy1_add_args cache_args
zpool_create_rm_add redundancy2_create_args redundancy2_add_args cache_args
zpool_create_rm_add redundancy3_create_args redundancy3_add_args cache_args
zpool_create_rm_add redundancy1_create_args redundancy1_add_args spare_args
zpool_create_rm_add redundancy2_create_args redundancy2_add_args spare_args
zpool_create_rm_add redundancy3_create_args redundancy3_add_args spare_args