xfs/068: Verify actual file count instead of reported file count

This test has the number of files/dirs created by xfsrestore hardcoded
in golden output.

When fsstress is added new ops, the number of files/dirs created with
the same random seed changes and this regularly breaks this test,
so when new fsstress ops are added they should be either added to the
dump test blacklist or golden output of this test needs to be ammended
to reflect the change.

The golden output includes only the file count reported by xfsrestore
and test does not even verify that this is the correct file count.
Instead, leave the golden output neutral and explicitly verify that
file count before and after the test are the same.

With this change, the test becomes agnostic to fsstress ops and we
could also stop blacklisting clone/dedup/copy ops if we want.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Amir Goldstein
2019-02-05 21:31:18 +02:00
committed by Eryu Guan
parent 53566fac8c
commit a70fb7335c
3 changed files with 34 additions and 2 deletions
+20
View File
@@ -1517,6 +1517,26 @@ _check_quota_file()
_check_quota 'xfsdump_quotas' 'xfsdump_quotas_group' 'xfsdump_quotas_proj'
}
_count_dir_files()
{
local dir=$1
local ndirs=$(find $dir -type d | wc -l)
local nents=$(find $dir | wc -l)
echo "$ndirs directories and $nents entries"
}
_count_dumpdir_files()
{
_count_dir_files $dump_dir
}
_count_restoredir_files()
{
_count_dir_files $restore_dir/$dump_sdir
}
# make sure this script returns success
/bin/true