Skip to content

Commit

Permalink
Clean up zfs_clone_010_pos
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Ryan Moeller authored and tonyhutter committed Jan 22, 2020
1 parent 27dda98 commit cea5002
Showing 1 changed file with 3 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ datasets="$TESTPOOL/$TESTFS1 $TESTPOOL/$TESTFS1/$TESTFS2
typeset -a d_clones
typeset -a deferred_snaps
typeset -i i
i=1
log_must setup_ds

log_note "Verify zfs clone property for multiple clones"
Expand All @@ -157,19 +156,16 @@ for ds in $datasets; do
((i=i+1))
done
names=$(zfs list -rt all -o name $TESTPOOL)
i=1
log_must verify_clones 2 1

log_must local_cleanup
log_must setup_ds

log_note "verify zfs deferred destroy on clones property"
i=1
names=$(zfs list -rt all -o name $TESTPOOL)
for ds in $datasets; do
log_must zfs destroy -d $ds@snap
deferred_snaps=( "${deferred_snaps[@]}" "$ds@snap" )
((i=i+1))
done
log_must verify_clones 3 0

Expand Down Expand Up @@ -206,28 +202,23 @@ for ds in $datasets; do
done
names=$(zfs list -rt all -o name,clones $TESTPOOL)
log_must verify_clones 3 1 $TESTCLONE
i=1
for ds in $datasets; do
log_must zfs promote $ds
((i=i+1))
done
log_must local_cleanup

log_note "verify clone list truncated correctly"
typeset -i j=200
i=1
fs=$TESTPOOL/$TESTFS1
xs=""; for i in {1..200}; do xs+="x"; done
if is_linux; then
ZFS_MAXPROPLEN=4096
else
ZFS_MAXPROPLEN=1024
fi
log_must zfs create $fs
log_must zfs snapshot $fs@snap
while((i <= $(( ZFS_MAXPROPLEN/200+1 )))); do
log_must zfs clone $fs@snap $fs/$TESTCLONE$(python -c 'print "x" * 200').$i
((i=i+1))
((j=j+200))
for (( i = 1; i <= (ZFS_MAXPROPLEN / 200 + 1); i++ )); do
log_must zfs clone ${fs}@snap ${fs}/${TESTCLONE}${xs}.${i}
done
clone_list=$(zfs list -o clones $fs@snap)
char_count=$(echo "$clone_list" | tail -1 | wc | awk '{print $3}')
Expand Down

0 comments on commit cea5002

Please sign in to comment.