#
# Functions useful for xfsdump/xfsrestore tests
#
-# Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of version 2 of the GNU General Public License as
#
# --- initializations ---
-rm -f $seq.full
+rm -f $here/$seq.full
if [ -n "$DEBUGDUMP" ]; then
- _dump_debug=-v5
- _restore_debug=-v5
+ _dump_debug=-v4
+ _restore_debug=-v4
_invutil_debug=-d
fi
# Use dump/restore in qa directory for debugging
-PATH=".:$PATH"
+PATH="$here:$PATH"
export PATH
#which xfsdump
#which xfsrestore
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
-
+have_mtvariable=false
+[ `uname` = "Linux" ] && have_mtvariable=true
#
# do a remote/local mt
_limit=10
i=0
while [ $i -lt $_limit ]; do
- echo "Checking online..." >>$seq.full
+ echo "Checking online..." >>$here/$seq.full
if _mt status >$tmp.status 2>&1; then
break;
else
_wait_tape()
{
- echo "Wait for tape, $dumptape, ..." >>$seq.full
+ echo "Wait for tape, $dumptape, ..." >>$here/$seq.full
i=0
while [ $i -lt 20 ]; do
- echo "Checking status..." >>$seq.full
- if _mt status 2>&1 | tee -a $seq.full | egrep -i "onl|ready" >/dev/null; then
+ echo "Checking status..." >>$here/$seq.full
+ if _mt status 2>&1 | tee -a $here/$seq.full | egrep -i "onl|ready" >/dev/null; then
break;
else
sleep 2
#
_rewind()
{
- echo "Initiate rewind..." >>$seq.full
+ echo "Initiate rewind..." >>$here/$seq.full
_wait_tape
_mt rewind >/dev/null
_wait_tape
#
_erase_soft()
{
- echo "Erasing tape" | tee -a $seq.full
+ echo "Erasing tape" | tee -a $here/$seq.full
_rewind
_mt weof 3
_rewind
_erase_hard()
{
- echo "Erasing tape" | tee -a $seq.full
+ echo "Erasing tape" | tee -a $here/$seq.full
_mt erase
}
_set_variable
}
-_error()
-{
- echo "Error: $*" | tee -a $seq.full
- echo "(see $seq.full for details)"
- status=1
- exit
-}
-
_wipe_fs()
{
_require_scratch
- mkfs -t xfs $MKFS_OPTS $SCRATCH_DEV>>$seq.full ||\
- _error "mkfs failed"
-
- mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full ||\
- _error "mount failed"
+ _scratch_mkfs_xfs >>$here/$seq.full || _fail "mkfs failed"
+ _scratch_mount >>$here/$seq.full || _fail "mount failed"
}
#
for dir in /var/xfsdump/inventory /var/lib/xfsdump/inventory; do
[ -d $dir ] || continue
tar -cvf $seq.inventory.tar $dir
- ls -lR $dir >$seq.inventory.ls
+ ls -nR $dir >$seq.inventory.ls
done
fi
done
if [ $status -ne $NOTRUNSTS ]; then
- # Sleep added to stop _check_fs from complaining that the
+ # Sleep added to stop _check_scratch_fs from complaining that the
# scratch_dev is still busy
sleep 10
- _check_fs $SCRATCH_DEV
+ _check_scratch_fs
fi
}
#
_stable_fs()
{
- umount $SCRATCH_MNT >>$seq.full ||\
- _error "unmount failed"
- mount -t xfs $SCRATCH_DEV $SCRATCH_MNT >>$seq.full ||\
- _error "mount failed"
+ _saveddir=`pwd`; cd /
+ umount $SCRATCH_MNT >>$here/$seq.full || _fail "unmount failed"
+ _scratch_mount >>$here/$seq.full || _fail "mount failed"
+ cd $_saveddir
}
#
-# Run src/fsstress to create a mixture of
+# Run fsstress to create a mixture of
# files,dirs,links,symlinks
#
# Pinched from test 013.
#
_create_dumpdir_stress()
{
- echo "Creating directory system to dump using src/fsstress."
+ echo "Creating directory system to dump using fsstress."
_wipe_fs
echo "-----------------------------------------------"
echo "fsstress : $_param"
echo "-----------------------------------------------"
- if ! $here/src/fsstress $_param -s 1 $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
+ if ! $here/ltp/fsstress $_param -s 1 $FSSTRESS_AVOID -n $_count -d $dump_dir >$tmp.out 2>&1
then
- echo " fsstress (count=$_count) returned $? - see $seq.full"
+ echo " fsstress (count=$_count) returned $? - see $here/$seq.full"
- echo "--------------------------------------" >>$here/$seq.full
- echo "output from fsstress:" >>$here/$seq.full
- echo "--------------------------------------" >>$here/$seq.full
- cat $tmp.out >>$here/$seq.full
+ echo "--------------------------------------" >>$here/$here/$seq.full
+ echo "output from fsstress:" >>$here/$here/$seq.full
+ echo "--------------------------------------" >>$here/$here/$seq.full
+ cat $tmp.out >>$here/$here/$seq.full
status=1
fi
_mk_fillconfig_ea()
{
cat <<End-of-File >$tmp.config
-# pathname size user group perm name value
+# pathname size user group perm name value namespace
#
-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
+smalll 10 $nobody $nobody 777 attr1 some_text user
+biggg 102400 $nobody $nobody 777 attr2 some_text2 root
+sub/smalll 10 $nobody $nobody 777 attr3 some_text3 user
+sub/biggg 102400 $nobody $nobody 777 attr4 some_text4 root
+dir d $nobody $nobody 777 attr5 dir_text user
#
# Add more files so that there are more than the number
# of streams.
End-of-File
}
+#
+# extended file attribute flags
+#
+_mk_fillconfig_xattr()
+{
+ cat <<End-of-File >$tmp.config
+# pathname size user group perm name
+#
+xflag_realtime 10 $nobody $nobody 777 XFS_XFLAG_REALTIME
+xflag_prealloc 10 $nobody $nobody 777 XFS_XFLAG_PREALLOC
+xflag_immutable 10 $nobody $nobody 777 XFS_XFLAG_IMMUTABLE
+xflag_append 10 $nobody $nobody 777 XFS_XFLAG_APPEND
+xflag_sync 10 $nobody $nobody 777 XFS_XFLAG_SYNC
+xflag_noatime 10 $nobody $nobody 777 XFS_XFLAG_NOATIME
+xflag_nodump 10 $nobody $nobody 777 XFS_XFLAG_NODUMP
+xflag_hasattr 10 $nobody $nobody 777 XFS_XFLAG_HASATTR
+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 || _fail "cannot mkdir \"$dump_dir\""
cd $dump_dir
$verbose && echo -n "Setup "
sed -e '/^#/d' $tmp.config \
- | while read file nbytes owner group perms ea_name ea_value
+ | while read file nbytes owner group perms ea_name ea_value namespace
do
if [ $nbytes = "d" ]; then
# create a directory
if [ -n "$perms" ]; then
chmod $perms $file
fi
+
+ # extended attributes (EA)
if [ -n "$ea_name" -a -n "$ea_value" ]; then
- attr -s $ea_name -V $ea_value $file
+ if [ "X$namespace" = "Xroot" ]; then
+ attr -R -s $ea_name -V $ea_value $file
+ else
+ attr -s $ea_name -V $ea_value $file
+ fi
+ # extended file attribute flags - no value - NOT EAs
+ elif [ -n "$ea_name" -a -z "$ea_value" ]; then
+ # set the flag
+ # TODO XXX
+ # use xfs_io to send the ioctl
+ :
fi
$verbose && echo -n "."
done
cd $here
}
+_create_dumpdir_largefile()
+{
+ _wipe_fs
+ mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\""
+ _largesize=4294967297
+ _largefile=$dump_dir/largefile
+ echo "dd a largefile at offset $_largesize"
+ POSIXLY_CORRECT=yes \
+ dd if=/dev/zero of=$_largefile bs=1 seek=$_largesize count=10 2>&1
+ _stable_fs
+}
_create_dumpdir_fill()
{
{
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 || _fail "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 || _fail "cannot mkdir \"$dump_dir\""
+ cd $dump_dir
+
+ _create_hardset $_numsets
+
+ cd $here
+ _stable_fs
+}
+
#
# Filter for ls
-# Filter out dates on symlinks and char devices
+# Filter out times and dates on symlinks and char devices.
+# Filter out size on directories because this can differ
+# when transitioning to long inode numbers (ie. 64 bits).
#
_ls_filter()
{
$AWK_PROG '
- /^l/ { date = $8; sub(date,"DATE"); print}
- /^c/ { date = $9; sub(date,"DATE"); print}
+ /^l/ { date = $8; time = $7; sub(date,"DATE"); sub(time,"TIME"); print}
+ /^c/ { date = $9; time = $7; sub(date,"DATE"); sub(time,"TIME"); print}
+ /^d/ { size = $5; sub(size,"SIZE"); print}
{print}' \
| sed -e 's/total [0-9][0-9]*/total TOTAL/'
}
+#
+# Filtering of Irix character hwgraph device names
+# e.g.
+# chardev: /hw/node/xtalk/15/pci/0/scsi_ctlr/0/target/1/lun/0/disk/partition/4/char
+# blkdev: /dev/dsk/dks0d1s4
+#
+_filter_devchar()
+{
+ $AWK_PROG '
+ /\/hw\/node/ {
+ sub(/\/hw.*scsi_ctlr\//,"/dev/dsk/dks") # blah blah /dev/dsk/dks0/target/1/....
+ sub(/\/target\//,"d") # blah blah /dev/dsk/dks0d1/lun/0/disk.....
+ sub(/\/lun.*partition\//,"s") # blah blah /dev/dsk/dks0d1s4/char
+ sub(/\/char/,"") # blah blah /dev/dsk/dks0d1s4
+ }
+ { print }
+ '
+}
+
#
# Filter out the non-deterministic dump msgs from
#
_dump_filter_main()
{
+ _filter_devchar |\
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/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 '/dump size per stream:/s/[0-9][0-9]*/NUM/' \
+ -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/session id:[ ]*[0-9a-f-]*/session id: ID/' \
+ -e '/filesystem id:[ ]*[0-9a-f-]*/d' \
+ -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 '/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 '/ - 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\)/' \
+ -e '/drive[ ]*[0-9][0-9]*:/d' \
+ -e '/\/dev\/tty/d' \
+ -e '/inventory session uuid/d' \
+ -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\)/' \
+ -e '/version 3\.0/d' \
+ -e 's/\/hw\/module.*$/SCRATCH_DEV/' \
+ -e 's/id:[[:space:]]*[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/ID: ID/' \
+ -e 's/\[y\/n\][- ]----------------------*/\[y\/n\]/' \
| perl -ne '
if ($_ =~ /(?:Dump|Restore) Summary/) {
$skip = 1;
{
if $do_quota_check
then
- _dump_filter_main | _check_quota_dumprestore
+ _dump_filter_main | _check_quota_dumprestore | _check_quota_entries
else
_dump_filter_main
fi
}
+#
+# Note: requires a space between option letter and argument
+#
_parse_args()
{
OPTIND=0
case $1
in
-f)
- [ -z "$2" ] && _error "missing argument for -f"
+ [ -z "$2" ] && _fail "missing argument for -f"
dumptape=$2
shift
;;
-L)
- [ -z "$2" ] && _error "missing argument for -L"
+ [ -z "$2" ] && _fail "missing argument for -L"
session_label=$2
shift
;;
-Q)
do_quota_check=false
;;
+ -l)
+ [ -z "$2" ] && _fail "missing argument for -l"
+ dump_args="$dump_args -l$2"
+ shift
+ ;;
*)
- _error "invalid argument"
+ _fail "invalid argument to common.dump function: $1"
;;
esac
shift
echo "Dumping to tape..."
opts="$_dump_debug$dump_args -s $dump_sdir -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 $here/$seq.full | _dump_filter
}
#
-# 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 $here/$seq.full | _dump_filter
}
onemeg=1048576
opts="$_dump_debug$dump_args -m -b $onemeg -l0 -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 $here/$seq.full | _dump_filter
}
-#
-# Do level 1 incremental dump
-#
-_do_dump_incremental()
-{
- _parse_args $*
-
- echo "Dumping incrementally to tape..."
- opts="$_dump_debug$dump_args -l1 -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
-}
#
# Do full dump to file
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
+ xfsdump $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
}
#
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
+ xfsdump $opts 2>&1 | tee -a $here/$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 || _fail "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
+ xfsrestore $opts 2>&1 | tee -a $here/$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
+ xfsrestore $opts 2>&1 | tee -a $here/$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
+ xfsrestore $opts 2>&1 | tee -a $here/$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 $here/$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 $here/$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
}
#
done
echo "Restoring from file..."
- opts="$_restore_debug$dump_args $multi_args -L $session_label $restore_dir"
+ 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
+ xfsrestore $opts 2>&1 | tee -a $here/$seq.full | _dump_filter
}
#
restore_opts="$_restore_debug - $restore_dir"
dump_opts="$_dump_debug$dump_args -s $dump_sdir - $SCRATCH_MNT"
echo "xfsdump $dump_opts | xfsrestore $restore_opts" | _dir_filter
- xfsdump $dump_opts 2>$tmp.dump.mlog | xfsrestore $restore_opts 2>&1 | tee -a $seq.full | _dump_filter
+ xfsdump $dump_opts 2>$tmp.dump.mlog | xfsrestore $restore_opts 2>&1 | tee -a $here/$seq.full | _dump_filter
_dump_filter <$tmp.dump.mlog
}
#
# Compare dumped subdirectory with restored dir
-# using ls -lR.
+# using ls -nR.
# Thus no contents are compared but permissions, sizes,
# owners, etc... are.
#
# verify we got back what we dumped
#
echo "Comparing listing of dump directory with restore directory"
- ls -lR $dump_dir | tee -a $seq.full | _ls_filter >$tmp.dump_dir
- ls -lR $restore_dir/$dump_sdir | tee -a $seq.full | _ls_filter \
+ ls -nR $dump_dir | tee -a $here/$seq.full | _ls_filter >$tmp.dump_dir
+ ls -nR $restore_dir/$dump_sdir | tee -a $here/$seq.full | _ls_filter \
| sed -e "s#$restore_sdir\/##" >$tmp.restore_dir
- diff -cs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
+ diff -bcs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
+
}
#
# verify we got back what we dumped
#
echo "Comparing listing of dump directory with restore directory"
- ls -lR $dump_dir | tee -a $seq.full | _ls_filter | _ls_nodate_filter >$tmp.dump_dir
- ls -lR $restore_dir/$dump_sdir | tee -a $seq.full | _ls_filter \
+ ls -nR $dump_dir | tee -a $here/$seq.full | _ls_filter | _ls_nodate_filter >$tmp.dump_dir
+ ls -nR $restore_dir/$dump_sdir | tee -a $here/$seq.full | _ls_filter \
| _ls_nodate_filter | sed -e "s#$restore_sdir\/##" >$tmp.restore_dir
- diff -cs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
+ diff -bcs $tmp.dump_dir $tmp.restore_dir | sed -e "s#$tmp#TMP#g"
}
#
{
_path=$1
- find $_path -exec attr -l {} \; |\
- awk '{print $9, $2}' |\
- sed 's/["]//g' |\
+# 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...
+ echo "User names"
+ getfattr --absolute-names -Rh -m user $_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
+
+ if [ "$USE_ATTR_SECURE" = yes ]; then
+ echo "Security names"
+ getfattr --absolute-names -Rh -m security $_path |\
+ perl -wn -e '
+ if (m/^# file: (\S+)/) { $file = $1 }
+ elsif (m/^security\.(\w+)/) { print $file, " ",$1,"\n" }' |\
+ sort |\
+ while read file ea_name; do
+ attr -g $ea_name $file
+ done
+ fi
+
+ echo "Root names"
+ getfattr --absolute-names -Rh -m trusted $_path |\
+ perl -wn -e '
+ if (m/^# file: (\S+)/) { $file = $1 }
+ elsif (m/^trusted\.(\w+)/) { print $file, " ",$1,"\n" }' |\
+ sort |\
+ while read file ea_name; do
+ attr -R -g $ea_name $file
+ done
}
#
#
_dump_inventory()
{
- xfsdump $_dump_debug -I | tee -a $seq.full | _dump_filter_main
+ xfsdump $_dump_debug -I | tee -a $here/$seq.full | _dump_filter_main
}
#
_do_invutil()
{
host=`hostname`
- echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$seq.full
+ echo "xfsinvutil $_invutil_debug -M $host:$SCRATCH_MNT \"$middate\" $*" >$here/$seq.full
xfsinvutil $_invutil_debug $* -M $host:$SCRATCH_MNT "$middate" \
- | tee -a $seq.full | _invutil_filter
+ | tee -a $here/$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=$here/$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
/bin/true
projects / xfstests-dev.git / blobdiff