fi
# Use dump/restore in qa directory for debugging
-#PATH=".:$PATH"
-#export PATH
+PATH="$here:$PATH"
+export PATH
#which xfsdump
#which xfsrestore
+#which xfsinvutil
# status returned for not run tests
NOTRUNSTS=2
# name those directories
dump_file=$tmp.dumpfile
+# dump_file=$here/dumpfile #TEMP OVERRIDE DUMP FILE
dump_sdir=dumpdir
dump_dir=$SCRATCH_MNT/$dump_sdir
restore_sdir=restoredir
restore_dir=$SCRATCH_MNT/$restore_sdir
-
+multi=3
dumptape=$TAPE_DEV
media_label="stress_tape_media"
session_label="stress_$seq"
fi
done
+# remove this when xfstests irix/linux port done
+if [ "X$XFS_HOST_OS" = "Xirix" ]
+then # IRIX
+ have_mtvariable=false
+ MKFS_OPTS=""
+else # Linux
+ have_mtvariable=true
+ MKFS_OPTS="-f"
+fi
+
#
# do a remote/local mt
#
_set_variable()
{
+ $have_mtvariable || return
+
if _isrmt; then
:
else
{
_require_scratch
- mkfs -t xfs -f $SCRATCH_DEV >>$seq.full ||\
+ mkfs_xfs $MKFS_OPTS $SCRATCH_DEV>>$seq.full ||\
_error "mkfs failed"
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full ||\
# save it for inspection
for dir in /var/xfsdump/inventory /var/lib/xfsdump/inventory; do
[ -d $dir ] || continue
- tar -zcvf $seq.inventory.tgz $dir
+ tar -cvf $seq.inventory.tar $dir
ls -lR $dir >$seq.inventory.ls
done
fi
fi
}
+#
+# ensure that bulkstat data will
+# match with incore data
+# by forcing disk data to be written out
+#
_stable_fs()
{
+ _saveddir=`pwd`; cd /
umount $SCRATCH_MNT >>$seq.full ||\
_error "unmount failed"
mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full ||\
_error "mount failed"
+ cd $_saveddir
}
#
echo "-----------------------------------------------"
echo "fsstress : $_param"
echo "-----------------------------------------------"
- if ! $here/src/fsstress $_param $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
+ if ! $here/src/fsstress $_param -s 1 $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
then
echo " fsstress (count=$_count) returned $? - see $seq.full"
End-of-File
}
+_mk_fillconfig_ea()
+{
+ cat <<End-of-File >$tmp.config
+# pathname size user group perm name value
+#
+smalll 10 $nobody $nobody 777 attr1 some_text
+biggg 102400 $nobody $nobody 777 attr2 some_text2
+sub/smalll 10 $nobody $nobody 777 attr3 some_text3
+sub/biggg 102400 $nobody $nobody 777 attr4 some_text4
+dir d $nobody $nobody 777 attr5 dir_text
+#
+# Add more files so that there are more than the number
+# of streams.
+# There are bugs in dump/restore for # non-dir files < # streams
+# It can be tested in another configuration.
+# It is a pathalogical case.
+#
+sub/a 1 $nobody $nobody
+sub/b 2 $nobody $nobody
+sub/c 4 $nobody $nobody
+sub/d 8 $nobody $nobody
+sub/e 16 $nobody $nobody
+sub/f 32 $nobody $nobody
+sub/g 64 $nobody $nobody
+sub/h 128 $nobody $nobody
+sub/i 256 $nobody $nobody
+sub/j 512 $nobody $nobody
+sub/k 1024 $nobody $nobody
+sub/l 2048 $nobody $nobody
+sub/m 4096 $nobody $nobody
+sub/n 8192 $nobody $nobody
+End-of-File
+}
+
#
# Create a bunch of directories/files of different sizes
# filled with data.
{
echo "Creating directory system to dump using src/fill."
- if mkdir -p $dump_dir
- then
- :
- else
- echo "Error: cannot mkdir \"$dump_dir\""
- exit 1
- fi
+ mkdir -p $dump_dir ||\
+ _error "cannot mkdir \"$dump_dir\""
cd $dump_dir
$verbose && echo -n "Setup "
sed -e '/^#/d' $tmp.config \
- | while read file nbytes owner group perms
+ | while read file nbytes owner group perms ea_name ea_value
do
if [ $nbytes = "d" ]; then
# create a directory
if [ -n "$perms" ]; then
chmod $perms $file
fi
+ if [ -n "$ea_name" -a -n "$ea_value" ]; then
+ attr -s $ea_name -V $ea_value $file
+ fi
$verbose && echo -n "."
done
$verbose && echo
_stable_fs
}
+_create_dumpdir_fill_ea()
+{
+ _wipe_fs
+ _mk_fillconfig_ea
+ _do_create_dumpdir_fill
+ _stable_fs
+}
#
{
echo "Creating directory system of symlinks to dump."
- if mkdir -p $dump_dir
- then
- :
- else
- echo "Error: cannot mkdir \"$dump_dir\""
- exit 1
- fi
+ mkdir -p $dump_dir ||\
+ _error "cannot mkdir \"$dump_dir\""
cd $dump_dir
$verbose && echo -n "Setup "
_stable_fs
}
+#
+# create hardlinks of form $_fname, $_fname_h1 $_fname_h2 ...
+#
+_create_hardlinks()
+{
+ _fname=$1
+ _numlinks=$2
+
+ touch $_fname
+ _j=1
+ while [ $_j -le $_numlinks ]; do
+ _suffix=_h$_j
+ _hardlink=$_fname$_suffix
+ echo "creating hardlink $_hardlink to $_fname"
+ ln $_fname $_hardlink
+ _j=`expr $_j + 1`
+ done
+}
+
+#
+# create a set of hardlinks
+# create hardlinks of form file1, file1_h1 file1_h2 ...
+# create hardlinks of form file2, file2_h1 file2_h2 ...
+# create hardlinks of form file3, file3_h1 file3_h2 ...
+#
+_create_hardset()
+{
+ _numsets=$1
+ _i=1
+ while [ $_i -le $_numsets ]; do
+ _create_hardlinks file$_i 5
+ _i=`expr $_i + 1`
+ done
+}
+
+
+_modify_level()
+{
+ _level=$1
+ echo "mod level $_level" >$dump_dir/file$_level
+}
+
+_create_dumpdir_hardlinks()
+{
+ _numsets=$1
+ _wipe_fs
+ echo "Creating directory system of hardlinks to incrementally dump."
+
+ mkdir -p $dump_dir ||\
+ _error "cannot mkdir \"$dump_dir\""
+ cd $dump_dir
+
+ _create_hardset $_numsets
+
+ cd $here
+ _stable_fs
+}
+
#
# Filter for ls
-# Filter out dates on symlinks
+# Filter out dates on symlinks and char devices
#
_ls_filter()
{
- $AWK_PROG '/^l/ { date = $8; sub(date,"DATE"); print}
+ $AWK_PROG '
+ /^l/ { date = $8; sub(date,"DATE"); print}
+ /^c/ { date = $9; sub(date,"DATE"); print}
{print}' \
| sed -e 's/total [0-9][0-9]*/total TOTAL/'
}
sed \
-e "s/`hostname`/HOSTNAME/" \
-e "s#$SCRATCH_DEV#SCRATCH_DEV#" \
+ -e "s#$SCRATCH_RAWDEV#SCRATCH_DEV#" \
-e "s#$dumptape#TAPE_DEV#" \
-e "s#$SCRATCH_MNT#SCRATCH_MNT#" \
-e "s#$dump_file#DUMP_FILE#" \
+ -e 's#/var/lib/xfsdump#/var/xfsdump#' \
-e 's/id:[ ]*[0-9a-f-]*/id: ID/' \
-e 's/time:[ ].*/time: TIME/' \
-e 's/date:[ ].*/date: DATE/' \
-e 's/dump begun .*/dump begun DATE/' \
-e 's/[0-9][0-9]* seconds/SECS seconds/' \
+ -e 's/restore.[0-9][0-9]*/restore.PID/' \
-e 's/ino [0-9][0-9]*/ino INO/' \
-e '/: dump size/s/[0-9][0-9]*/NUM/' \
-e '/dump size:/s/[0-9][0-9]*/NUM/' \
- -e '/media file size/s/[0-9][0-9]*/NUM/' \
- -e '/mfile size:[ ]*/s/[0-9][0-9]*/NUM/' \
+ -e '/dump size per stream:/s/[0-9][0-9]*/NUM/' \
+ -e 's/\(media file size[ ]*\)[0-9][0-9]*/\1NUM/' \
+ -e 's/\(mfile size:[ ]*\)[0-9][0-9]*/\1NUM/' \
+ -e '/drive[ ]*[0-9][0-9]*:/d' \
-e '/\/dev\/tty/d' \
-e '/inventory session uuid/d' \
- -e 's#/var/lib/xfsdump#/var/xfsdump#' \
-
+ -e '/ - Running single-threaded/d' \
+ -e '/^.*I\/O metrics: .*$/d' \
+ -e 's/1048576/BLOCKSZ/' \
+ -e 's/2097152/BLOCKSZ/' \
+ -e 's/(pid[ ]*[1-9][0-9]*)/\(pid PID\)/' \
+ | perl -ne '
+ if ($_ =~ /(?:Dump|Restore) Summary/) {
+ $skip = 1;
+ } elsif ($_ =~ /(?:Dump|Restore) Status/) {
+ $skip = 0;
+ }
+ print if (! $skip);'
}
_dump_filter()
{
- if $do_quota_check
- then
- _dump_filter_main | _check_quota_dumprestore
- else
- _dump_filter_main
- fi
+ if $do_quota_check
+ then
+ _dump_filter_main | _check_quota_dumprestore | _check_quota_entries
+ else
+ _dump_filter_main
+ fi
}
_invutil_filter()
}
+
_dir_filter()
{
sed \
-e "s#$dump_file#DUMP_FILE#" \
-e "s#$SCRATCH_DEV#SCRATCH_DEV#" \
+ -e "s#$SCRATCH_RAWDEV#SCRATCH_DEV#" \
-e "s#$dumptape#TAPE_DEV#" \
-e "s#$dump_dir#DUMP_DIR#g" \
-e "s#$restore_dir#RESTORE_DIR#g" \
-e "s#$SCRATCH_MNT#SCRATCH_MNT#g" \
-e "s#$dump_sdir#DUMP_SUBDIR#g" \
-e "s#$restore_sdir#RESTORE_SUBDIR#g" \
+ -e "s#$$#PID#g" \
}
+#
+# Note: requires a space between option letter and argument
+#
_parse_args()
{
OPTIND=0
dump_args=""
- while getopts "f:FL:oqQ" c $*
+ while [ $# -gt 0 ]
do
- case $c
+ case $1
in
- f)
- [ -z "$OPTARG" ] && _error "missing argument for -f"
- dumptape=$OPTARG
+ -f)
+ [ -z "$2" ] && _error "missing argument for -f"
+ dumptape=$2
+ shift
;;
- L)
- [ -z "$OPTARG" ] && _error "missing argument for -L"
- session_label=$OPTARG
+ -L)
+ [ -z "$2" ] && _error "missing argument for -L"
+ session_label=$2
+ shift
;;
- o)
+ -o)
dump_args="$dump_args -o"
;;
- F)
+ -F)
dump_args="$dump_args -F"
;;
- q)
- do_quota_check=true
+ --multi)
+ multi=$2
+ shift
+ ;;
+ -q)
+ do_quota_check=true
+ ;;
+ -Q)
+ do_quota_check=false
;;
- Q)
- do_quota_check=false
+ -l)
+ [ -z "$2" ] && _error "missing argument for -l"
+ dump_args="$dump_args -l$2"
+ shift
;;
- \?)
- _error "invalid argument"
+ *)
+ _error "invalid argument to common.dump function: $1"
;;
esac
+ shift
done
}
}
#
-# Do full level 0 dump
+# Do dump to tape
#
_do_dump()
{
_parse_args $*
echo "Dumping to tape..."
- opts="$_dump_debug$dump_args -l0 -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
+ opts="$_dump_debug$dump_args -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
xfsdump $opts 2>&1 | tee -a $seq.full | _dump_filter
}
xfsdump $opts 2>&1 | tee -a $seq.full | _dump_filter
}
+
#
-# Do level 1 incremental dump
+# Do full dump to file
#
-_do_dump_incremental()
+_do_dump_file()
{
_parse_args $*
- echo "Dumping incrementally to tape..."
- opts="$_dump_debug$dump_args -l1 -f $dumptape -M $media_label -L $session_label $SCRATCH_MNT"
+ echo "Dumping to file..."
+ opts="$_dump_debug$dump_args -f $dump_file -M $media_label -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
xfsdump $opts 2>&1 | tee -a $seq.full | _dump_filter
}
#
-# Do full dump to file
+# Do full dump to multiple files
#
-_do_dump_file()
+_do_dump_multi_file()
{
- _parse_args $*
+ _parse_args "$@"
- echo "Dumping to file..."
- opts="$_dump_debug$dump_args -f $dump_file -M $media_label -L $session_label $SCRATCH_MNT"
+ multi_args=""
+
+ i=0
+ while [ $i -lt $multi ]
+ do
+ multi_args="$multi_args -f $dump_file.$i -M $media_label.$i"
+ i=`expr $i + 1`
+ done
+
+ echo "Dumping to files..."
+ opts="$_dump_debug$dump_args $multi_args -L $session_label $SCRATCH_MNT"
echo "xfsdump $opts" | _dir_filter
xfsdump $opts 2>&1 | tee -a $seq.full | _dump_filter
}
_prepare_restore_dir()
{
rm -rf $restore_dir
- if ! mkdir $restore_dir; then
- echo " failed to mkdir $restore_dir"
- status=1
- exit
- fi
+ mkdir $restore_dir ||\
+ _error "failed to mkdir $restore_dir"
}
echo "Restoring from tape..."
- opts="$_restore_debug$dump_args -f $dumptape -L $session_label $restore_dir"
+ opts="$_restore_debug -f $dumptape -L $session_label $restore_dir"
echo "xfsrestore $opts" | _dir_filter
xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter
}
echo "Restoring from tape..."
onemeg=1048576
- opts="$_restore_debug$dump_args -m -b $onemeg -f $dumptape -L $session_label $restore_dir"
+ opts="$_restore_debug -m -b $onemeg -f $dumptape -L $session_label $restore_dir"
echo "xfsrestore $opts" | _dir_filter
xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter
}
_prepare_restore_dir
echo "Restoring from file..."
- opts="$_restore_debug$dump_args -f $dump_file -L $session_label $restore_dir"
+ opts="$_restore_debug -f $dump_file -L $session_label $restore_dir"
+ echo "xfsrestore $opts" | _dir_filter
+ xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter
+}
+
+#
+# Cumulative restore from a file
+# Need to specify the dump level e.g. "-l 0"
+#
+_do_restore_file_cum()
+{
+ _parse_args $*
+ if echo $dump_args | grep '\-l0' >/dev/null; then
+ _prepare_restore_dir
+ fi
+
+ echo "Restoring cumumlative from file..."
+ opts="$_restore_debug -f $dump_file -r $restore_dir"
+ echo "xfsrestore $opts" | _dir_filter
+ xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter
+}
+
+_do_restore_toc()
+{
+ echo "Contents of dump ..."
+ opts="$_restore_debug -f $dump_file -t"
+ echo "xfsrestore $opts" | _dir_filter
+ cd $SCRATCH_MNT # for IRIX which needs xfs cwd
+ xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter_main |\
+ _check_quota_file |\
+ _check_quota_entries |\
+ $AWK_PROG 'NF != 1 { print; next }
+ {files = sprintf("%s\n%s", files, $1)}
+ END { print files | "sort" } '
+ # the above awk code is to alpha sort only the output
+ # of files (and not the verbose restore msgs)
+ cd $here # put back
+}
+
+#
+# Restore the tape from multiple dump files
+#
+_do_restore_multi_file()
+{
+ _parse_args "$@"
+ _prepare_restore_dir
+
+ multi_args=""
+
+ i=0
+ while [ $i -lt $multi ]
+ do
+ multi_args="$multi_args -f $dump_file.$i"
+ i=`expr $i + 1`
+ done
+
+ echo "Restoring from file..."
+ opts="$_restore_debug $multi_args -L $session_label $restore_dir"
echo "xfsrestore $opts" | _dir_filter
xfsrestore $opts 2>&1 | tee -a $seq.full | _dump_filter
}
diff -cs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
}
-
#
# Compare using recursive diff the files of the dumped
# subdirectory.
diff -rs $dump_dir $restore_dir/$dump_sdir | _dir_filter
}
+_get_eas_on_path()
+{
+ _path=$1
+
+# Tim - this is the IRIX way...
+ # find $_path -exec attr -l {} \; |\
+ # awk '{print $9, $2}' |\
+ # sed 's/["]//g' |\
+ # sort |\
+# and this is now the Linux way...
+ getfattr --absolute-names -Rh $_path |\
+ perl -wn -e '
+ if (m/^# file: (\S+)/) { $file = $1 }
+ elsif (m/^user\.(\w+)/) { print $file, " ",$1,"\n" }' |\
+ sort |\
+ while read file ea_name; do
+ attr -g $ea_name $file
+ done
+}
+
+#
+# Compare the extended attributes of the files/dirs
+# b/w the dumped and restore dirs.
+#
+#
+# Attribute "attr5" had a 8 byte value for /spare1/dump.5460/dir:
+# Attribute "attr5" had a 8 byte value for /spare1/restore.5460/dump.5460/dir:
+#
+_diff_compare_eas()
+{
+ echo "Comparing dump directory with restore directory"
+ echo "Looking at the extended attributes (EAs)"
+ echo "EAs on dump"
+ _get_eas_on_path $dump_dir | tee $seq.ea1 | _dir_filter
+ echo "EAs on restore"
+ _get_eas_on_path $restore_dir/$dump_sdir \
+ | sed -e "s#$restore_sdir\/##" \
+ | tee $seq.ea2 \
+ | _dir_filter
+ diff -s $seq.ea1 $seq.ea2
+}
+
+
#
# Compare using recursive diff the files of the dumped
# filesystem
{
host=`hostname`
echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$seq.full
- xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT "$middate" $* \
+ xfsinvutil $_invutil_debug $* -M $host:$SCRATCH_MNT "$middate" \
| tee -a $seq.full | _invutil_filter
}
#
-# Look for:
-# xfsdump: saving user quota information for: SCRATCH_MNT
-# xfsdump: saving group quota information for: SCRATCH_MNT
-# xfsrestore: user quota information written to ...'
-# xfsrestore: group quota information written to ...'
+# ensure we can find the user quota msg if user quotas are on
+# ensure we can find the group quota msg if group quotas are on
#
-_check_quota_dumprestore()
+_check_quota()
{
+ usermsg=$1
+ groupmsg=$2
uquota=0
gquota=0
- src/feature -U $SCRATCH_DEV && uquota=1
- src/feature -G $SCRATCH_DEV && gquota=1
+ $here/src/feature -U $SCRATCH_DEV && uquota=1
+ $here/src/feature -G $SCRATCH_DEV && gquota=1
- $AWK_PROG -v uquota=$uquota -v gquota=$gquota -v full=$seq.full '
- /user quota information/ {
- print "Found user quota:", $0 >>full
- found_uquota = 1
- if (!uquota) {
+ $AWK_PROG -v uquota=$uquota -v gquota=$gquota -v full=$seq.full \
+ -v usermsg="$usermsg" -v groupmsg="$groupmsg" '
+ $0 ~ groupmsg {
+ print "Found group quota:", $0 >>full
+ found_gquota = 1
+ if (!gquota) {
print "Found extra:", $0
}
next
}
- /group quota information/ {
- print "Found group quota:", $0 >>full
- found_gquota = 1
- if (!gquota) {
+ $0 ~ usermsg {
+ print "Found user quota:", $0 >>full
+ found_uquota = 1
+ if (!uquota) {
print "Found extra:", $0
}
next
{ print }
END {
if (uquota && !found_uquota) {
- print "Missing saving/restoring uquota msg"
+ print "Missing: ", usermsg
}
if (gquota && !found_gquota) {
- print "Missing saving/restoring gquota msg"
+ print "Missing: ", groupmsg
}
}
'
}
+#
+# xfsrestore: 3 directories and 40 entries processed
+# $5 = 40
+# num entries needs to be reduced by num quota file(s)
+#
+_check_quota_entries()
+{
+ uquota=0
+ gquota=0
+ $here/src/feature -U $SCRATCH_DEV && uquota=1
+ $here/src/feature -G $SCRATCH_DEV && gquota=1
+ $AWK_PROG -v uquota=$uquota -v gquota=$gquota '
+ /entries processed/ {
+ if (uquota) $5--
+ if (gquota) $5--
+ }
+ {print}'
+}
+
+#
+# Look for:
+# xfsdump: saving user quota information for: SCRATCH_MNT
+# xfsdump: saving group quota information for: SCRATCH_MNT
+# xfsrestore: user quota information written to ...'
+# xfsrestore: group quota information written to ...'
+#
+_check_quota_dumprestore()
+{
+ _check_quota 'user quota information' \
+ 'group quota information'
+}
+
#
# Look for:
# Only in RESTORE_DIR: xfsdump_quotas
# Only in RESTORE_DIR: xfsdump_quotas_group
#
-
_check_quota_diff()
{
- uquota=0
- gquota=0
- src/feature -U $SCRATCH_DEV && uquota=1
- src/feature -G $SCRATCH_DEV && gquota=1
+ _check_quota 'Only in RESTORE_DIR: xfsdump_quotas' \
+ 'Only in RESTORE_DIR: xfsdump_quotas_group'
+}
- $AWK_PROG -v uquota=$uquota -v gquota=$gquota '
- /Only in RESTORE_DIR: xfsdump_quotas_group/ {
- found_gquota = 1
- if (!gquota) {
- print "Found extra:", $0
- }
- next
- }
- /Only in RESTORE_DIR: xfsdump_quotas/ {
- found_uquota = 1
- if (!uquota) {
- print "Found extra:", $0
- }
- next
- }
- { print }
- END {
- if (uquota && !found_uquota) {
- print "Missing xfsdump_quotas msg"
- }
- if (gquota && !found_gquota) {
- print "Missing xfsdump_quotas_group msg"
- }
- }
- '
+#
+# Look for the quota file in the output
+# Ensure that it is there if it should be
+# Filter it out so that the output is always the same
+# even with no quotas
+#
+_check_quota_file()
+{
+ _check_quota 'xfsdump_quotas' 'xfsdump_quotas_group'
}
# make sure this script returns success
projects / xfstests-dev.git / blobdiff