X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flustre-rsync-test.sh;h=8888469fdb4bc9eb77ad5a2e6368e144fc2840cc;hb=3c580c93b8d3e94fac0ac2cf3cca2ff706c6497a;hp=a67447e3b46c0b2f82ec911b39bef3c3a087c11d;hpb=61e2111852fd6923947b1b0f9731c2a30c8dfb44;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lustre-rsync-test.sh b/lustre/tests/lustre-rsync-test.sh
index a67447e3b..8888469f 100644
--- a/lustre/tests/lustre-rsync-test.sh
+++ b/lustre/tests/lustre-rsync-test.sh
@@ -1,38 +1,30 @@
 #!/bin/bash
-# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
-# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 #
 # Run select tests by setting ONLY, or as arguments to the script.
 # Skip specific tests by setting EXCEPT.
 #
-# Run test by setting NOSETUP=true when ltest has setup env for us
 set -e
 
-SRCDIR=`dirname $0`
-export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
-
 ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT="$LRSYNC_EXCEPT"
-# bug number for skipped test:
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-
-[ "$SLOW" = "no" ] && EXCEPT_SLOW=""
-
-[ "$ALWAYS_EXCEPT$EXCEPT" ] &&
-	echo "Skipping tests: `echo $ALWAYS_EXCEPT $EXCEPT`"
 
 KILL=/bin/kill
-
-TMP=${TMP:-/tmp}
 LREPL_LOG=$TMP/lustre_rsync.log
 ORIG_PWD=${PWD}
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+ALWAYS_EXCEPT="$LRSYNC_EXCEPT "
+# bug number for skipped test: LU-4256
+ALWAYS_EXCEPT+="               2b"
+# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+build_test_filter
+
+[ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
 check_and_setup_lustre
 
 DIR=${DIR:-$MOUNT}
@@ -46,50 +38,44 @@ else
 	error "No generic nobody group"
 fi
 
-build_test_filter
-
 export LRSYNC=${LRSYNC:-"$LUSTRE/utils/lustre_rsync"}
 [ ! -f "$LRSYNC" ] && export LRSYNC=$(which lustre_rsync)
 export LRSYNC="$LRSYNC -v -c no -d 2"
 
-# control the time of tests
-DBENCH_TIME=${DBENCH_TIME:-60}  # No of seconds to run dbench
+# Number of seconds to run dbench
+DBENCH_TIME=${DBENCH_TIME:-60}
 TGT=$TMP/target
 TGT2=$TMP/target2
 MDT0=$($LCTL get_param -n mdc.*.mds_server_uuid |
 	awk '{ gsub(/_UUID/,""); print $1 }' | head -n1)
 
 init_changelog() {
-    CL_USER=$(do_facet $SINGLEMDS lctl --device $MDT0 changelog_register -n)
-    echo $MDT0: Registered changelog user $CL_USER
-    CL_USERS=$(( $(do_facet $SINGLEMDS lctl get_param -n \
-	mdd.$MDT0.changelog_users | wc -l) - 2 ))
-    [ $CL_USERS -ne 1 ] && \
-	echo "Other changelog users present ($CL_USERS)"
+	changelog_register || error "changelog_register failed"
+	CL_USER=(${CL_USERS[$SINGLEMDS]})
+	echo $MDT0: Registered changelog user $CL_USER
+	[ -z $CL_USER ] &&
+		echo "No changelog users present on $SINGLEMDS"
 }
 
-init_src() {
-    rm -rf $TGT/$tdir $TGT/d*.lustre_rsync-test 2> /dev/null
-    rm -rf $TGT2/$tdir $TGT2/d*.lustre_rsync-test 2> /dev/null
-    rm -rf ${DIR}/$tdir $DIR/d*.lustre_rsync-test ${DIR}/tgt 2> /dev/null
-    rm -f $LREPL_LOG
-    mkdir -p ${DIR}/$tdir
-    mkdir -p ${TGT}/$tdir
-    mkdir -p ${TGT2}/$tdir
-    if [ $? -ne 0 ]; then
-        error "Failed to create target: " $TGT
-    fi
+fini_changelog() {
+	changelog_clear
+	changelog_deregister
 }
 
-cleanup_src_tgt() {
-    rm -rf $TGT/$tdir
-    rm -rf $DIR/$tdir
-    rm -rf $DIR/tgt
+init_src() {
+	rm -rf $TGT/$tdir $TGT/d*.lustre_rsync-test 2> /dev/null
+	rm -rf $TGT2/$tdir $TGT2/d*.lustre_rsync-test 2> /dev/null
+	rm -rf ${DIR}/$tdir $DIR/d*.lustre_rsync-test ${DIR}/tgt 2> /dev/null
+	rm -f $LREPL_LOG
+	mkdir -p ${DIR}/$tdir || error "Failed to create target: " $DIR/$tdir
+	mkdir -p ${TGT}/$tdir || error "Failed to create target: " $TGT/$tdir
+	mkdir -p ${TGT2}/$tdir || error "Failed to create target: " $TGT2/$tdir
 }
 
-fini_changelog() {
-    $LFS changelog_clear $MDT0 $CL_USER 0
-    do_facet $SINGLEMDS lctl --device $MDT0 changelog_deregister $CL_USER
+cleanup_src_tgt() {
+	rm -rf $TGT/$tdir
+	rm -rf $DIR/$tdir
+	rm -rf $DIR/tgt
 }
 
 # Check whether the filesystem supports xattr or not.
@@ -160,8 +146,8 @@ stop_procs() {
 	return 1
 }
 
-# Test 1 - test basic operations
-test_1() {
+# Test 1A - test basic operations
+test_1A() { # was test_1
     init_src
     init_changelog
     local xattr=$(check_xattr $TGT/foo)
@@ -217,34 +203,23 @@ test_1() {
 	echo "Replication #2"
 	$LRSYNC -l $LREPL_LOG -D $LRSYNC_LOG
 
-    if [[ "$xattr" != "no" ]]; then
-        local xval1=$(get_xattr_value user.foo $TGT/$tdir/file5)
-        local xval2=$(get_xattr_value user.foo $TGT2/$tdir/file5)
-    fi
-
-    RC=0
+	if [[ "$xattr" != "no" ]]; then
+		local xval1=$(get_xattr_value user.foo $TGT/$tdir/file5)
+		local xval2=$(get_xattr_value user.foo $TGT2/$tdir/file5)
 
-    # fid2path and path2fid aren't implemented for block devices
-    #if [[ ! -b $TGT/$tdir/dev1 ]] || [[ ! -b $TGT2/$tdir/dev1 ]]; then
-    #   ls -l $DIR/$tdir/dev1 $TGT/$tdir/dev1 $TGT2/$tdir/dev1
-    #   error "Error replicating block devices"
-    #   RC=1
-
-    if [[ "$xattr" != "no" ]] &&
-       [[ "$xval1" != "$value" || "$xval2" != "$value" ]]; then
-        error "Error in replicating xattrs."
-        RC=1
-    fi
+		if [[ "$xval1" != "$value" || "$xval2" != "$value" ]]; then
+			error "Error in replicating xattrs."
+		fi
+	fi
 
 	# Use diff to compare the source and the destination
 	check_diff $DIR/$tdir $TGT/$tdir
 	check_diff $DIR/$tdir $TGT2/$tdir
 
-    fini_changelog
-    cleanup_src_tgt
-    return $RC
+	fini_changelog
+	cleanup_src_tgt
 }
-run_test 1 "Simple Replication"
+run_test 1A "Simple Replication"
 
 # Test 1a - test create/delete operations in ROOT directory
 test_1a() { # LU-5005
@@ -314,7 +289,6 @@ test_2a() {
 }
 run_test 2a "Replicate files created by dbench."
 
-
 # Test 2b - Replicate files changed by dbench.
 test_2b() {
 	local child_pid
@@ -421,7 +395,6 @@ test_3a() {
 }
 run_test 3a "Replicate files created by createmany"
 
-
 # Test 3b - Replicate files created by writemany
 test_3b() {
 	init_src
@@ -470,19 +443,16 @@ run_test 3c "Replicate files created by createmany/unlinkmany"
 
 # Test 4 - Replicate files created by iozone
 test_4() {
-    which iozone > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-	skip "iozone not found. Skipping test"
-	return
-    fi
+	which iozone > /dev/null 2>&1
+	[ $? -ne 0 ] && skip "iozone not found"
 
-    init_src
-    init_changelog
+	init_src
+	init_changelog
 
-    END_RUN_FILE=${DIR}/$tdir/run LOAD_PID_FILE=${DIR}/$tdir/pid \
-        MOUNT=${DIR}/$tdir run_iozone.sh &
-    sleep 30
-    child_pid=$(pgrep iozone)
+	END_RUN_FILE=${DIR}/$tdir/run LOAD_PID_FILE=${DIR}/$tdir/pid \
+		MOUNT=${DIR}/$tdir run_iozone.sh &
+	sleep 30
+	child_pid=$(pgrep iozone)
 	stop_procs $child_pid
 
 	local LRSYNC_LOG=$(generate_logname "lrsync_log")
@@ -610,13 +580,15 @@ run_test 6 "lustre_rsync large no of hard links"
 
 # Test 7 - lustre_rsync stripesize
 test_7() {
-    init_src
-    mkdir -p ${DIR}/tgt/$tdir
-    init_changelog
+	local numfiles=100
+
+	init_src
+	mkdir -p ${DIR}/tgt/$tdir
+	init_changelog
 
-    local NUMFILES=100
-    lfs setstripe -c $OSTCOUNT $DIR/$tdir
-    createmany -o $DIR/$tdir/$tfile $NUMFILES
+	$LFS setstripe -c $OSTCOUNT $DIR/$tdir ||
+		error "$LFS setstripe failed"
+	createmany -o $DIR/$tdir/$tfile $numfiles
 
 	# To simulate replication to another lustre filesystem, replicate
 	# the changes to $DIR/tgt. We can't turn off the changelogs
@@ -629,9 +601,9 @@ test_7() {
 	check_diff ${DIR}/$tdir $DIR/tgt/$tdir
 
 	local i=0
-	while [ $i -lt $NUMFILES ];
+	while [ $i -lt $numfiles ];
 	do
-		local count=$(lfs getstripe $DIR/tgt/$tdir/${tfile}$i | \
+		local count=$($LFS getstripe $DIR/tgt/$tdir/${tfile}$i |
 			      awk '/stripe_count/ {print $2}')
 		if [ $count -ne $OSTCOUNT ]; then
 			error "Stripe size not replicated"