From 6dd95a910a258c38f239785d7275cd93ab29da37 Mon Sep 17 00:00:00 2001 From: Akash Ayare Date: Thu, 2 Jun 2016 21:00:23 -0700 Subject: [PATCH] OpenZFS 7027 - zfs_written_property_001_pos makes unreasonable assumptions about metadata space usage Reviewed by: Prakash Surya Reviewed by: John Kennedy Reviewed by: Matthew Ahrens Reviewed by: Igor Kozhukhov Approved by: Gordon Ross Reviewed-by: George Melikov Ported-by: Brian Behlendorf OpenZFS-issue: https://www.illumos.org/issues/7027 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/48cb8b9 Issue #2441 Closes #5778 --- .../zfs_property/zfs_written_property_001_pos.ksh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh index ad9687942..23763608e 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_property/zfs_written_property_001_pos.ksh @@ -11,7 +11,7 @@ # # -# Copyright (c) 2012 by Delphix. All rights reserved. +# Copyright (c) 2012, 2015 by Delphix. All rights reserved. # # @@ -63,11 +63,8 @@ typeset -l total=0 typeset -l snap1_size=0 typeset -l snap2_size=0 typeset -l snap3_size=0 -typeset -l metadata=0 typeset -l mb_block=0 ((mb_block = 1024 * 1024)) -# approximate metadata on dataset when empty is 32KB -((metadata = 32 * 1024)) log_note "verify written property statistics for dataset" log_must $ZFS create -p $TESTPOOL/$TESTFS1/$TESTFS2/$TESTFS3 @@ -90,7 +87,10 @@ blocks=0 for i in 1 2 3; do written=$(get_prop written $TESTPOOL/$TESTFS1@snap$i) if [[ $blocks -eq 0 ]]; then - expected_written=$metadata + # Written value for the frist non-clone snapshot is + # expected to be equal to the referenced value. + expected_written=$( \ + get_prop referenced $TESTPOOL/$TESTFS1@snap$i) else ((expected_written = blocks * mb_block)) fi