change to new incremental syntax

This commit is contained in:
Tim Shimmin
2001-11-30 03:24:22 +00:00
parent 812effc477
commit be7aadc67e
10 changed files with 1710 additions and 51 deletions
+1 -1
View File
@@ -61,7 +61,7 @@ _do_dump
_append_dumpdir_fill
src/bstat $SCRATCH_MNT >>$here/$seq.full
_erase_hard
_do_dump_incremental
_do_dump -l 1
_do_restore
_diff_compare
+2 -2
View File
@@ -4,7 +4,7 @@ Creating directory system to dump using src/fill.
Setup ....................................
Erasing tape
Dumping to tape...
xfsdump -l0 -f TAPE_DEV -M stress_tape_media -L stress_024 SCRATCH_MNT
xfsdump -f TAPE_DEV -M stress_tape_media -L stress_024 SCRATCH_MNT
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
@@ -38,7 +38,7 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS
Erasing tape
Dumping incrementally to tape...
Dumping to tape...
xfsdump -l1 -f TAPE_DEV -M stress_tape_media -L stress_024 SCRATCH_MNT
xfsdump: level 1 incremental dump of HOSTNAME:SCRATCH_MNT based on level 0 dump begun DATE
xfsdump: dump date: DATE
+2 -2
View File
@@ -4,7 +4,7 @@ Creating directory system to dump using src/fill.
Setup ....................................
Erasing tape
Dumping to tape...
xfsdump -l0 -f TAPE_DEV -M stress_tape_media -L 035.1 SCRATCH_MNT
xfsdump -f TAPE_DEV -M stress_tape_media -L 035.1 SCRATCH_MNT
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
@@ -40,7 +40,7 @@ xfsdump: Dump Status: SUCCESS
Creating directory system to dump using src/fill.
Setup ....
Dumping to tape...
xfsdump -l0 -f TAPE_DEV -M stress_tape_media -L 035.2 SCRATCH_MNT
xfsdump -f TAPE_DEV -M stress_tape_media -L 035.2 SCRATCH_MNT
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
+1 -1
View File
@@ -3,7 +3,7 @@ Creating directory system to dump using src/fill.
Setup ....................................
Erasing tape
Dumping to tape...
xfsdump -l0 -f TAPE_DEV -M stress_tape_media -L stress_038 SCRATCH_MNT
xfsdump -f TAPE_DEV -M stress_tape_media -L stress_038 SCRATCH_MNT
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
+1 -1
View File
@@ -3,7 +3,7 @@ Creating directory system to dump using src/fill.
Setup ....................................
Erasing tape
Dumping to tape...
xfsdump -o -F -l0 -f TAPE_DEV -M stress_tape_media -L stress_039 SCRATCH_MNT
xfsdump -o -F -f TAPE_DEV -M stress_tape_media -L stress_039 SCRATCH_MNT
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
+1 -1
View File
@@ -3,7 +3,7 @@ Creating directory system to dump using src/fill.
Setup ....................................
Erasing tape
Dumping to tape...
xfsdump -o -F -l0 -f TAPE_DEV -M stress_tape_media -L stress_055 SCRATCH_MNT
xfsdump -o -F -f TAPE_DEV -M stress_tape_media -L stress_055 SCRATCH_MNT
xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT
xfsdump: dump date: DATE
xfsdump: session id: ID
Executable
+113
View File
@@ -0,0 +1,113 @@
#! /bin/sh
# XFS QA Test No. 064
# $Id: 1.1 $
#
# test multilevel dump and restores with hardlinks
#
#-----------------------------------------------------------------------
# Copyright (c) 2000 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
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it would be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# Further, this software is distributed without any warranty that it is
# free of the rightful claim of any third person regarding infringement
# or the like. Any license provided herein, whether implied or
# otherwise, applies only to this software file. Patent licenses, if
# any, provided herein do not apply to combinations of this program with
# other software, or any other product whatsoever.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write the Free Software Foundation, Inc., 59
# Temple Place - Suite 330, Boston MA 02111-1307, USA.
#
# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
# Mountain View, CA 94043, or:
#
# http://www.sgi.com
#
# For further information regarding this notice, see:
#
# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
#-----------------------------------------------------------------------
#
# creator
owner=tes@sagan.melbourne.sgi.com
seq=`basename $0`
echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
. ./common.dump
_ls_size_filter()
{
#
# Print size ($5) and fname ($9).
# The size is significant since we add to the file as part
# of a file change for the incremental.
#
# Filter out the housekeeping files of xfsrestore
#
$AWK_PROG 'NF == 9 { print $5, $9 }' |\
egrep -v 'dumpdir|housekeeping|dirattr|dirextattr|namreg|state|tree'
}
# real QA test starts here
_create_dumpdir_hardlinks 9
echo "Do the incremental dumps"
i=0
while [ $i -le 9 ]; do
if [ $i -gt 0 ]; then
_modify_level $i
sleep 2
_stable_fs
fi
dump_file=$tmp.df.level$i
_do_dump_file -l $i
i=`expr $i + 1`
done
echo "Listing of what files we start with:"
ls -l $dump_dir | _ls_size_filter
echo "Look at what files are contained in the inc. dump"
i=0
while [ $i -le 9 ]; do
echo ""
echo "restoring from df.level$i"
dump_file=$tmp.df.level$i
_do_restore_toc
i=`expr $i + 1`
done
echo "Do the cumulative restores"
i=0
while [ $i -le 9 ]; do
dump_file=$tmp.df.level$i
echo ""
echo "restoring from df.level$i"
_do_restore_file_cum -l $i
echo "ls -l restore_dir"
ls -lR $restore_dir | _ls_size_filter
i=`expr $i + 1`
done
# success, all done
status=0
exit
+1474
View File
File diff suppressed because it is too large Load Diff
+114 -43
View File
@@ -44,7 +44,7 @@ if [ -n "$DEBUGDUMP" ]; then
fi
# Use dump/restore in qa directory for debugging
PATH=".:$PATH"
PATH="$here:$PATH"
export PATH
#which xfsdump
#which xfsrestore
@@ -463,13 +463,8 @@ _do_create_dumpdir_fill()
{
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 "
@@ -598,13 +593,8 @@ _do_create_dump_symlinks()
{
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 "
@@ -678,6 +668,64 @@ _create_dumpdir_symlinks()
_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 and char devices
@@ -772,6 +820,9 @@ _dir_filter()
}
#
# Note: requires a space between option letter and argument
#
_parse_args()
{
OPTIND=0
@@ -806,8 +857,13 @@ _parse_args()
-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
@@ -829,14 +885,14 @@ _do_dump_sub()
}
#
# 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
}
@@ -856,18 +912,6 @@ _do_dump_min()
xfsdump $opts 2>&1 | tee -a $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
@@ -908,11 +952,8 @@ _do_dump_multi_file()
_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"
}
@@ -937,7 +978,7 @@ _do_restore()
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
}
@@ -952,7 +993,7 @@ _do_restore_min()
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
}
@@ -966,11 +1007,41 @@ _do_restore_file()
_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 |\
$AWK_PROG 'NF != 1 { print; next }
{files = sprintf("%s\n%s", files, $1)}
END { print files | "sort" } '
cd $here # put back
}
#
# Restore the tape from multiple dump files
#
@@ -989,7 +1060,7 @@ _do_restore_multi_file()
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
}
@@ -1141,8 +1212,8 @@ _check_quota_dumprestore()
{
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/ {
@@ -1183,8 +1254,8 @@ _check_quota_diff()
{
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 '
/Only in RESTORE_DIR: xfsdump_quotas_group/ {
+1
View File
@@ -118,3 +118,4 @@ ioctl nathans@sgi.com
061 xfsdump ioctl auto
062 attr auto
063 xfsdump auto
064 xfsdump auto