Whamcloud - gitweb
LU-2675 cleanup: remove obsolete llog-test crud
authorJohn L. Hammond <john.hammond@intel.com>
Fri, 1 Feb 2013 04:00:07 +0000 (22:00 -0600)
committerOleg Drokin <oleg.drokin@intel.com>
Fri, 22 Mar 2013 18:14:32 +0000 (14:14 -0400)
Do not create the llog-test.c symlink as this Linux 2.4-ism is no
longer needed. Also remove the now defunct llog-test.sh.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I72ba710659e168ead206a2b9b28633724d0e44c5
Reviewed-on: http://review.whamcloud.com/5239
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/obdclass/.gitignore [deleted file]
lustre/obdclass/Makefile.in
lustre/obdclass/autoMakefile.am
lustre/tests/Makefile.am
lustre/tests/llog-test.sh [deleted file]
lustre/tests/run-llog.sh

diff --git a/lustre/obdclass/.gitignore b/lustre/obdclass/.gitignore
deleted file mode 100644 (file)
index df263b4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/llog-test.c
index 996e2a7..053a725 100644 (file)
@@ -22,12 +22,7 @@ obdclass-objs := $(obdclass-linux-objs) $(obdclass-all-objs)
 
 EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
 
-llog_test-objs := llog-test.o
-
-$(obj)/llog-test.c: $(obj)/llog_test.c
-       ln -sf $< $@
-
-EXTRA_DIST  = $(filter-out llog-test.c,$(obdclass-all-objs:.o=.c)) $(llog-test-objs:.o=.c) llog_test.c llog_internal.h
+EXTRA_DIST = $(obdclass-all-objs:.o=.c) llog_test.c llog_internal.h
 EXTRA_DIST += cl_internal.h local_storage.h
 
 @INCLUDE_RULES@
index c40f2b9..50efaf3 100644 (file)
@@ -52,5 +52,5 @@ endif # MODULES
 
 install-data-hook: $(install_data_hook)
 
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  llog-test.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
 MOSTLYCLEANFILES += linux/*.o darwin/*.o
index 12deeb8..98ce34d 100644 (file)
@@ -14,7 +14,7 @@ noinst_SCRIPTS = leak_finder.pl llmount.sh llmountcleanup.sh functions.sh
 noinst_SCRIPTS += test-framework.sh runvmstat runiozone runtests sanity.sh
 noinst_SCRIPTS += rundbench acceptance-small.sh compile.sh conf-sanity.sh
 noinst_SCRIPTS += insanity.sh lfsck.sh oos.sh oos2.sh dne_sanity.sh
-noinst_SCRIPTS += llog-test.sh recovery-small.sh replay-dual.sh sanity-quota.sh
+noinst_SCRIPTS += recovery-small.sh replay-dual.sh sanity-quota.sh
 noinst_SCRIPTS += replay-ost-single.sh replay-single.sh run-llog.sh sanityn.sh
 noinst_SCRIPTS += large-scale.sh racer.sh replay-vbr.sh
 noinst_SCRIPTS += performance-sanity.sh mdsrate-create-small.sh
diff --git a/lustre/tests/llog-test.sh b/lustre/tests/llog-test.sh
deleted file mode 100644 (file)
index f26bfc9..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LUSTRE=${LUSTRE:-`dirname $0`/..}
-. $LUSTRE/tests/test-framework.sh
-
-init_test_env $@
-
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
-
-ostfailover_HOST=${ostfailover_HOST:-$ost_HOST}
-
-gen_config() {
-    rm -f "$XMLCONFIG"
-    add_mds mds --dev "$MDSDEV" --size "$MDSSIZE"
-    add_lov lov1 mds --stripe_sz $STRIPE_BYTES \
-       --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
-    add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE --failover
-    if [ ! -z "$ostfailover_HOST" ]; then
-        add_ostfailover ost --dev $OSTDEV --size $OSTSIZE
-    fi
-    add_client client mds --lov lov1 --path $MOUNT
-}
-
-cleanup() {
-    # make sure we are using the primary MDS, so the config log will
-    # be able to clean up properly.
-    activeost=`facet_active ost`
-    if [ $activeost != "ost" ]; then
-        fail ost
-    fi
-    zconf_umount `hostname` $MOUNT
-    stop mds ${FORCE} $MDSLCONFARGS
-    stop ost ${FORCE} --dump $TMP/replay-ost-single-`hostname`.log
-    cleanup_check
-}
-
-if [ "$ONLY" == "cleanup" ]; then
-    sysctl -w portals.debug=0
-    FORCE=--force cleanup
-    exit
-fi
-
-build_test_filter
-
-SETUP=${SETUP:-"setup"}
-CLEANUP=${CLEANUP:-"cleanup"}
-
-setup() {
-    gen_config
-
-    start ost --reformat $OSTLCONFARGS
-    [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
-    start mds --reformat $MDSLCONFARGS
-
-    if [ -z "`grep " $MOUNT " /proc/mounts`" ]; then
-       # test "-1" needed during initial client->OST connection
-       log "== test 00: target handle mismatch (bug 5317) === `date +%H:%M:%S`"
-
-       #define OBD_FAIL_OST_ALL_REPLY_NET       0x211
-       do_facet ost1 "lctl set_param fail_loc=0x80000211"
-
-       zconf_mount `hostname` $MOUNT && df $MOUNT && pass || error "mount fail"
-    fi
-}
-
-mkdir -p $DIR
-
-$SETUP
-
-LCOUNT=${LCOUNT:-10000}
-
-test_0() {
-    ./createmany -o $DIR/llog-%d $LCOUNT
-    #replay_barrier ost
-}
-run_test 0 "Prepare fileset"
-
-test_1() {
-    ./chownmany 1000 $DIR/llog-%d $LCOUNT
-    sleep 5
-    $CHECKSTAT -u \#1000 $DIR/llog-* || return 4
-}
-run_test 1 "Do chowns"
-
-test_2() {
-    HALFCOUNT=${HALFCOUNT:-17}
-    ./chownmany 500 $DIR/llog-%d 0 $HALFCOUNT
-    fail ost
-    ./chownmany 500 $DIR/llog-%d $HALFCOUNT $LCOUNT
-    sleep 5
-    $CHECKSTAT -u \#500 $DIR/llog-* || return 5
-}
-run_test 2 "Fail OST during chown"
-
-test_3() {
-    ./unlinkmany $DIR/llog-%d $LCOUNT
-    sleep 2
-    $CHECKSTAT -t file $DIR/llog-* && return 10 || true
-}
-run_test 3 "Remove testset"
-
-complete $SECONDS
-FORCE=--force $CLEANUP
index aa41fa1..81c0e24 100644 (file)
@@ -10,9 +10,6 @@ load_llog_test() {
     # But maybe we're running from a developer tree...
     insmod $LUSTRE/obdclass/llog_test.ko
     grep -q llog_test /proc/modules && return
-    # This is for 2.4 kernels (deprecated!)
-    insmod $LUSTRE/obdclass/llog_test.o
-    grep -q llog_test /proc/modules && return
     echo "Unable to load llog_test module!"
     false
     return