summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2018-12-27 13:12:53 -0800
committerBrian Behlendorf <[email protected]>2019-01-07 11:03:18 -0800
commita769fb53a17e7f8b6375b25cd23f3ff491b631cb (patch)
tree66ae3ad10f44584173ec1ffb14c4d6efb7dc0f95 /tests
parentc10d37dd9f5d56e19330add732f1a713250d24f7 (diff)
Add 'zpool status -i' option
Only display the full details of the vdev initialization state in 'zpool status' output when requested with the -i option. By default display '(initializing)' after vdevs when they are being actively initialized. This is consistent with the established precident of appending '(resilvering), etc' and fits within the default 80 column terminal width making it easy to read. Additionally, updated the 'zpool initialize' documentation to make it clear the options are mutually exclusive, but allow duplicate options like all other zfs/zpool commands. Reviewed by: Matt Ahrens <[email protected]> Reviewed-by: loli10K <[email protected]> Reviewed-by: Tim Chase <[email protected]> Reviewed-by: George Wilson <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #8230
Diffstat (limited to 'tests')
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize.kshlib2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize.kshlib
index 0f4e7f0fa..8b0727483 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_initialize/zpool_initialize.kshlib
@@ -21,7 +21,7 @@ function initialize_prog_line # pool disk
{
typeset pool="$1"
typeset disk="$2"
- zpool status "$pool" | grep "$disk" | grep "initialized"
+ zpool status -i "$pool" | grep "$disk" | grep "[[:digit:]]* initialized"
}
function initialize_progress # pool disk