c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up zfs_clone_010_pos

Browse Source 
Remove a lot of unnecessary setting and incrementing of `i`.

Remove unused variable `j`.

Instead of calling out to Python in a loop to generate the same string
repeatedly, generate the string once using shell constructs before
entering the loop.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9284
This commit is contained in:
Ryan Moeller 2019-09-05 19:20:09 -04:00 committed by Tony Hutter
parent 27dda98b88
commit cea50025fd
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh
View File

@ -143,7 +143,6 @@ datasets="$TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS1/$TESTFS2
typeset -a d_clones typeset -a d_clones
typeset -a deferred_snaps typeset -a deferred_snaps
typeset -i i typeset -i i
i=1
log_must setup_ds log_must setup_ds
log_note "Verify zfs clone property for multiple clones" log_note "Verify zfs clone property for multiple clones"
@ -157,19 +156,16 @@ for ds in $datasets; do
((i=i+1)) ((i=i+1))
done done
names=$(zfs list -rt all -o name $TESTPOOL) names=$(zfs list -rt all -o name $TESTPOOL)
i=1
log_must verify_clones 2 1 log_must verify_clones 2 1
log_must local_cleanup log_must local_cleanup
log_must setup_ds log_must setup_ds
log_note "verify zfs deferred destroy on clones property" log_note "verify zfs deferred destroy on clones property"
i=1
names=$(zfs list -rt all -o name $TESTPOOL) names=$(zfs list -rt all -o name $TESTPOOL)
for ds in $datasets; do for ds in $datasets; do
log_must zfs destroy -d $ds@snap log_must zfs destroy -d $ds@snap
deferred_snaps=( "${deferred_snaps[@]}" "$ds@snap" ) deferred_snaps=( "${deferred_snaps[@]}" "$ds@snap" )
((i=i+1))
done done
log_must verify_clones 3 0 log_must verify_clones 3 0
@ -206,17 +202,14 @@ for ds in $datasets; do
done done
names=$(zfs list -rt all -o name,clones $TESTPOOL) names=$(zfs list -rt all -o name,clones $TESTPOOL)
log_must verify_clones 3 1 $TESTCLONE log_must verify_clones 3 1 $TESTCLONE
i=1
for ds in $datasets; do for ds in $datasets; do
log_must zfs promote $ds log_must zfs promote $ds
((i=i+1))
done done
log_must local_cleanup log_must local_cleanup
log_note "verify clone list truncated correctly" log_note "verify clone list truncated correctly"
typeset -i j=200
i=1
fs=$TESTPOOL/$TESTFS1 fs=$TESTPOOL/$TESTFS1
xs=""; for i in {1..200}; do xs+="x"; done
if is_linux; then if is_linux; then
ZFS_MAXPROPLEN=4096 ZFS_MAXPROPLEN=4096
else else
@ -224,10 +217,8 @@ else
fi fi
log_must zfs create $fs log_must zfs create $fs
log_must zfs snapshot $fs@snap log_must zfs snapshot $fs@snap
while((i <= $(( ZFS_MAXPROPLEN/200+1 )))); do for (( i = 1; i <= (ZFS_MAXPROPLEN / 200 + 1); i++ )); do
log_must zfs clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i log_must zfs clone ${fs}@snap ${fs}/${TESTCLONE}${xs}.${i}
((i=i+1))
((j=j+200))
done done
clone_list=$(zfs list -o clones $fs@snap) clone_list=$(zfs list -o clones $fs@snap)
char_count=$(echo "$clone_list" | tail -1 | wc | awk '{print $3}') char_count=$(echo "$clone_list" | tail -1 | wc | awk '{print $3}')