From 8904b7e4958f886afc48108504bd558703930b48 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Tue, 6 Sep 2011 19:43:11 +0530 Subject: some changes in the regression framework and testcases for some bugs --- dvm/1532/testcase | 14 ++++++++++++++ dvm/1534/testcase | 14 ++++++++++++++ dvm/1535/testcase | 16 ++++++++++++++++ dvm/2010/testcase | 2 +- dvm/2033/testcase | 2 +- dvm/2059/testcase | 28 ++++++++++++++++++++++++++++ dvm/2099/testcase | 2 +- dvm/2140/testcase | 2 +- dvm/2145/testcase | 2 +- dvm/2154/testcase | 2 +- dvm/2294/testcase | 2 +- dvm/2369/testcase | 2 +- dvm/2393/testcase | 19 +++++++++++++++++++ dvm/2426/testcase | 2 +- dvm/2483/testcase | 2 +- dvm/2501/testcase | 2 +- dvm/2532/testcase | 34 ++++++++++++++++++++++++++++++++++ dvm/2547/testcase | 32 ++++++++++++++++++++++++++++++++ dvm/2623/testcase | 2 +- dvm/2742/testcase | 2 +- 20 files changed, 170 insertions(+), 13 deletions(-) create mode 100755 dvm/1532/testcase create mode 100755 dvm/1534/testcase create mode 100755 dvm/1535/testcase create mode 100755 dvm/2059/testcase create mode 100755 dvm/2393/testcase create mode 100755 dvm/2532/testcase create mode 100755 dvm/2547/testcase (limited to 'dvm') diff --git a/dvm/1532/testcase b/dvm/1532/testcase new file mode 100755 index 0000000..11e5f44 --- /dev/null +++ b/dvm/1532/testcase @@ -0,0 +1,14 @@ +#!/bin/bash +source $cwd/regression_helpers + +VOLNAME="vol$global_bug_id"; + +USAGE_INFO=`$GLUSTERFSDIR/gluster volume create $VOLNAME replica 2 | grep 'Usage:' | wc -l` + +if [ "$USAGE_INFO" -eq "1" ]; then + RET="0"; +else + RET="1"; +fi + +exit $RET; diff --git a/dvm/1534/testcase b/dvm/1534/testcase new file mode 100755 index 0000000..6a3cc1f --- /dev/null +++ b/dvm/1534/testcase @@ -0,0 +1,14 @@ +#!/bin/bash +source $cwd/regression_helpers + +VOLNAME="vol$global_bug_id"; + +COUNT=`$GLUSTERFSDIR/gluster volume create $VOLNAME replica 1 $(hostname):$EXPORT_DIR/$global_bug_id/export1 | grep 'replica count should be greater than 1' | wc -l` + +if [ "$COUNT" -eq "1" ]; then + RET="0" +else + RET="1" +fi + +exit $RET; diff --git a/dvm/1535/testcase b/dvm/1535/testcase new file mode 100755 index 0000000..d799749 --- /dev/null +++ b/dvm/1535/testcase @@ -0,0 +1,16 @@ +#!/bin/bash +source $cwd/regression_helpers + +VOLNAME="vol$global_bug_id"; + +$GLUSTERFSDIR/gluster volume create $VOLNAME $(hostname):$EXPORT_DIR/$global_bug_id/export1 $(hostname):$EXPORT_DIR/$global_bug_id/export2 2>/dev/null 1>/dev/null; + +VOLTYPE=`$GLUSTERFSDIR/gluster volume info $VOLNAME | grep Type | cut -d ' ' -f2` + +if [ "$VOLTYPE" == "Distribute" ]; then + RET="0"; +else + RET="1"; +fi + +exit $RET; diff --git a/dvm/2010/testcase b/dvm/2010/testcase index d14f338..e3052b7 100755 --- a/dvm/2010/testcase +++ b/dvm/2010/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cw$cwd/regression_helpers $GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null; diff --git a/dvm/2033/testcase b/dvm/2033/testcase index 03d0879..a888928 100755 --- a/dvm/2033/testcase +++ b/dvm/2033/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers $GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null; diff --git a/dvm/2059/testcase b/dvm/2059/testcase new file mode 100755 index 0000000..14b83e4 --- /dev/null +++ b/dvm/2059/testcase @@ -0,0 +1,28 @@ +#!/bin/bash + +source $cwd/regression_helpers + +VOLNAME="vol$global_bug_id"; + +$GLUSTERFSDIR/gluster volume create $VOLNAME $(hostname):$EXPORT_DIR/$global_bug_id/export1 $(hostname):$EXPORT_DIR/$global_bug_id/export2 2>/dev/null 1>/dev/null; + +$GLUSTERFSDIR/gluster volume start $VOLNAME 2>/dev/null 1>/dev/null; + +$GLUSTERFSDIR/glusterfs -s $(hostname) -p /tmp/client.pid -l /tmp/regr.log --volfile-id=$VOLNAME $FUSE_MOUNT; + +FUSE_PID=`cat /tmp/client.pid` + +sleep 5 + +kill -USR1 $FUSE_PID + +OUT=`grep 'xlator.mount.fuse.entry_timeout=1.000000' /tmp/glusterdump.$FUSE_PID | wc -l` + +if [ "$OUT" -eq "0" ]; then + RET="1"; +else + RET="0"; +fi + +rm -f /tmp/glusterdump.$FUSE_PID +exit $RET; diff --git a/dvm/2099/testcase b/dvm/2099/testcase index c7f5d82..08c84e4 100755 --- a/dvm/2099/testcase +++ b/dvm/2099/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="volley" diff --git a/dvm/2140/testcase b/dvm/2140/testcase index 34b7d5e..28deb0c 100755 --- a/dvm/2140/testcase +++ b/dvm/2140/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers $GLUSTERFSDIR/gluster volume delete $global_bug_id --mode=script | grep -i "exist" 2>/dev/null 1>/dev/null exit $?; diff --git a/dvm/2145/testcase b/dvm/2145/testcase index afeee55..969c522 100755 --- a/dvm/2145/testcase +++ b/dvm/2145/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id"; diff --git a/dvm/2154/testcase b/dvm/2154/testcase index 50b58c0..a3f8730 100755 --- a/dvm/2154/testcase +++ b/dvm/2154/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers $GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null diff --git a/dvm/2294/testcase b/dvm/2294/testcase index b0d8674..2f984cf 100755 --- a/dvm/2294/testcase +++ b/dvm/2294/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers $GLUSTERFSDIR/gluster volume create $global_bug_id transport tcp,rdma $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null exit $?; diff --git a/dvm/2369/testcase b/dvm/2369/testcase index f25af14..2ad2557 100755 --- a/dvm/2369/testcase +++ b/dvm/2369/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers $GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null; diff --git a/dvm/2393/testcase b/dvm/2393/testcase new file mode 100755 index 0000000..d47bdad --- /dev/null +++ b/dvm/2393/testcase @@ -0,0 +1,19 @@ +#!/bin/bash + +source $cwd/regression_helpers +stat $GLUSTERDIR/bin/glusterfs-volgen 2>/dev/null 1>/dev/null; +if [ $? -eq 0 ]; then + exit 22; +fi + +sleep 5; + +stat $GLUSTERDIR/bin/glusterfs-defrag 2>/dev/null 1>/dev/null; +if [ $? -eq 0 ]; then + exit 22; +fi + +sleep 5; + + +exit $?; diff --git a/dvm/2426/testcase b/dvm/2426/testcase index 4c5dda9..1c9e750 100755 --- a/dvm/2426/testcase +++ b/dvm/2426/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers $GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/brick1 $(hostname):$EXPORT_DIR/$global_bug_id/brick2 2>/dev/null 1>/dev/null diff --git a/dvm/2483/testcase b/dvm/2483/testcase index ba62402..a0a85d2 100755 --- a/dvm/2483/testcase +++ b/dvm/2483/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id" diff --git a/dvm/2501/testcase b/dvm/2501/testcase index 63561c5..4702b00 100755 --- a/dvm/2501/testcase +++ b/dvm/2501/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id"; diff --git a/dvm/2532/testcase b/dvm/2532/testcase new file mode 100755 index 0000000..29089ae --- /dev/null +++ b/dvm/2532/testcase @@ -0,0 +1,34 @@ +#!/bin/bash + +source $cwd/regression_helpers + +$GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/brick1 $(hostname):$EXPORT_DIR/$global_bug_id/brick2 $(hostname):$EXPORT_DIR/$global_bug_id/brick3 $(hostname):$EXPORT_DIR/$global_bug_id/brick4 2>/dev/null 1>/dev/null; + +$GLUSTERFSDIR/gluster volume start $global_bug_id 2>/dev/null 1>/dev/null + +mount_glusterfs $global_bug_id + +sleep 2; + +touch $FUSE_MOUNT/{1..100}; 2>/dev/null 1>/dev/null; + +kill -KILL `ps -aef | grep brick1 | head -n 1 | awk '{print $2}'`; + +ls $FUSE_MOUNT/ 2>/dev/null 1>/dev/null; +temp=$?; +if [ $temp -eq 0 ]; then + kill -KILL `ps -aef | grep brick2 | head -n 1 | awk '{print $2}'`; + kill -KILL `ps -aef | grep brick3 | head -n 1 | awk '{print $2}'`; + ls $FUSE_MOUNT/ 2>/dev/null 1>/dev/null; + temp1=$?; + if [ $temp1 -eq 0 ]; then + $GLUSTERFSDIR/gluster volume start $global_bug_id force 2>/dev/null 1>/dev/null + rm -f $FUSE_MOUNT/{1..100} 2>/dev/null 1>/dev/null; + umount $FUSE_MOUNT ; + exit 0; + else + exit 1; + fi +else + exit 1; +fi diff --git a/dvm/2547/testcase b/dvm/2547/testcase new file mode 100755 index 0000000..03f7d73 --- /dev/null +++ b/dvm/2547/testcase @@ -0,0 +1,32 @@ +#!/bin/bash + +source $cwd/regression_helpers + +VOLNAME="vol$global_bug_id"; + +$GLUSTERFSDIR/gluster volume create $VOLNAME $(hostname):$EXPORT_DIR/$global_bug_id/export1 $(hostname):$EXPORT_DIR/$global_bug_id/export2 2>/dev/null 1>/dev/null; + +$GLUSTERFSDIR/gluster volume start $VOLNAME 2>/dev/null 1>/dev/null; + +$GLUSTERFSDIR/gluster volume rebalance $VOLNAME start 2>/dev/null 1>/dev/null; +if [ $? -ne 0 ]; then + exit 22; +fi + +sleep 10; + +$GLUSTERFSDIR/gluster volume rebalance $VOLNAME fix-layout start 2>/dev/null 1>/dev/null; +if [ $? -ne 0 ]; then + exit 22; +fi + +sleep 10; + +$GLUSTERFSDIR/gluster volume rebalance $VOLNAME migrate-data start 2>/dev/null 1>/dev/null; +if [ $? -ne 0 ]; then + exit 22; +fi + +sleep 10; + +exit $?; diff --git a/dvm/2623/testcase b/dvm/2623/testcase index 48b209a..b90c3eb 100755 --- a/dvm/2623/testcase +++ b/dvm/2623/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers $GLUSTERFSDIR/gluster volume create $global_bug_id $(hostname):$EXPORT_DIR/$global_bug_id/export1 2>/dev/null 1>/dev/null; diff --git a/dvm/2742/testcase b/dvm/2742/testcase index 062c144..800924e 100755 --- a/dvm/2742/testcase +++ b/dvm/2742/testcase @@ -1,6 +1,6 @@ #!/bin/bash -source ./regression_helpers +source $cwd/regression_helpers VOLNAME="vol$global_bug_id"; -- cgit