mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
cmd: rename arc_summary to zarcsummary
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Colm Buckley <colm@tuatha.org> Signed-off-by: Shengqi Chen <harry-chen@outlook.com> Closes #16357 Closes #17712
This commit is contained in:
committed by
Brian Behlendorf
parent
5bf1500ee3
commit
743866cd2a
@@ -625,7 +625,7 @@ tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
|
||||
'zpool_offline_001_neg', 'zpool_online_001_neg', 'zpool_remove_001_neg',
|
||||
'zpool_replace_001_neg', 'zpool_scrub_001_neg', 'zpool_set_001_neg',
|
||||
'zpool_status_001_neg', 'zpool_upgrade_001_neg', 'arcstat_001_pos',
|
||||
'arc_summary_001_pos', 'arc_summary_002_neg', 'zpool_wait_privilege',
|
||||
'zarcsummary_001_pos', 'zarcsummary_002_neg', 'zpool_wait_privilege',
|
||||
'zilstat_001_pos']
|
||||
user =
|
||||
tags = ['functional', 'cli_user', 'misc']
|
||||
|
||||
@@ -401,7 +401,7 @@ tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
|
||||
'zpool_history_001_neg', 'zpool_offline_001_neg', 'zpool_online_001_neg',
|
||||
'zpool_remove_001_neg', 'zpool_scrub_001_neg', 'zpool_set_001_neg',
|
||||
'zpool_status_001_neg', 'zpool_upgrade_001_neg', 'arcstat_001_pos',
|
||||
'arc_summary_001_pos', 'arc_summary_002_neg', 'zpool_wait_privilege',
|
||||
'zarcsummary_001_pos', 'zarcsummary_002_neg', 'zpool_wait_privilege',
|
||||
'zilstat_001_pos']
|
||||
user =
|
||||
tags = ['functional', 'cli_user', 'misc']
|
||||
|
||||
@@ -232,7 +232,7 @@ maybe = {
|
||||
'cli_root/zpool_trim/zpool_trim_fault_export_import_online':
|
||||
['FAIL', known_reason],
|
||||
'cli_root/zpool_upgrade/zpool_upgrade_004_pos': ['FAIL', 6141],
|
||||
'cli_user/misc/arc_summary_001_pos': ['FAIL', known_reason],
|
||||
'cli_user/misc/zarcsummary_001_pos': ['FAIL', known_reason],
|
||||
'delegate/setup': ['SKIP', exec_reason],
|
||||
'events/zed_cksum_config': ['FAIL', known_reason],
|
||||
'fault/auto_replace_002_pos': ['FAIL', known_reason],
|
||||
|
||||
@@ -171,7 +171,7 @@ export ZFS_FILES='zdb
|
||||
zpool
|
||||
ztest
|
||||
raidz_test
|
||||
arc_summary
|
||||
zarcsummary
|
||||
arcstat
|
||||
zilstat
|
||||
dbufstat
|
||||
|
||||
@@ -1352,8 +1352,8 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
|
||||
functional/cli_root/zpool/zpool_003_pos.ksh \
|
||||
functional/cli_root/zpool/zpool_colors.ksh \
|
||||
functional/cli_user/misc/arcstat_001_pos.ksh \
|
||||
functional/cli_user/misc/arc_summary_001_pos.ksh \
|
||||
functional/cli_user/misc/arc_summary_002_neg.ksh \
|
||||
functional/cli_user/misc/zarcsummary_001_pos.ksh \
|
||||
functional/cli_user/misc/zarcsummary_002_neg.ksh \
|
||||
functional/cli_user/misc/zilstat_001_pos.ksh \
|
||||
functional/cli_user/misc/cleanup.ksh \
|
||||
functional/cli_user/misc/setup.ksh \
|
||||
|
||||
+5
-5
@@ -30,16 +30,16 @@
|
||||
|
||||
is_freebsd && ! python3 -c 'import sysctl' 2>/dev/null && log_unsupported "python3 sysctl module missing"
|
||||
|
||||
log_assert "arc_summary generates output and doesn't return an error code"
|
||||
log_assert "zarcsummary generates output and doesn't return an error code"
|
||||
|
||||
# Without this, the below checks aren't going to work the way we hope...
|
||||
set -o pipefail
|
||||
|
||||
for arg in "" "-a" "-d" "-p 1" "-g" "-s arc" "-r"; do
|
||||
log_must eval "arc_summary $arg > /dev/null"
|
||||
log_must eval "zarcsummary $arg > /dev/null"
|
||||
done
|
||||
|
||||
log_must eval "arc_summary | head > /dev/null"
|
||||
log_must eval "arc_summary | head -1 > /dev/null"
|
||||
log_must eval "zarcsummary | head > /dev/null"
|
||||
log_must eval "zarcsummary | head -1 > /dev/null"
|
||||
|
||||
log_pass "arc_summary generates output and doesn't return an error code"
|
||||
log_pass "zarcsummary generates output and doesn't return an error code"
|
||||
+3
-3
@@ -30,10 +30,10 @@
|
||||
|
||||
is_freebsd && ! python3 -c 'import sysctl' 2>/dev/null && log_unsupported "python3 sysctl module missing"
|
||||
|
||||
log_assert "arc_summary generates an error code with invalid options"
|
||||
log_assert "zarcsummary generates an error code with invalid options"
|
||||
|
||||
for arg in "-x" "-5" "-p 7" "--err" "-@"; do
|
||||
log_mustnot eval "arc_summary $arg > /dev/null"
|
||||
log_mustnot eval "zarcsummary $arg > /dev/null"
|
||||
done
|
||||
|
||||
log_pass "arc_summary generates an error code with invalid options"
|
||||
log_pass "zarcsummary generates an error code with invalid options"
|
||||
Reference in New Issue
Block a user