summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x133/regr/testcase2
-rw-r--r--250/regr/spec_files/client1.vol37
-rw-r--r--250/regr/spec_files/server1.vol34
-rw-r--r--250/regr/spec_files/server2.vol34
-rwxr-xr-x250/regr/spec_files/ss.sh8
-rwxr-xr-x250/regr/testcase33
-rw-r--r--26/regr/spec_files/client1.vol9
-rw-r--r--26/regr/spec_files/server1.vol24
-rwxr-xr-x26/regr/testcase44
-rw-r--r--init12
-rwxr-xr-xsetup4
11 files changed, 11 insertions, 230 deletions
diff --git a/133/regr/testcase b/133/regr/testcase
index b391448..3b0590b 100755
--- a/133/regr/testcase
+++ b/133/regr/testcase
@@ -28,7 +28,7 @@ sleep 5
if [ $(getfattr -d -e hex -m "trusted.glusterfs.content" $MOUNTDIR/client1 2> /dev/null | wc -l) -ne 0 ];then
ok $description
else
- not_ok $desrciption
+ not_ok $description
comment $comments
fi
diff --git a/250/regr/spec_files/client1.vol b/250/regr/spec_files/client1.vol
deleted file mode 100644
index dce323a..0000000
--- a/250/regr/spec_files/client1.vol
+++ /dev/null
@@ -1,37 +0,0 @@
-# **** Clustered Client config file ****
-
-### Add client feature and attach to remote subvolume of server1
-volume client1
- type protocol/client
- option transport-type tcp # for TCP/IP transport
- option remote-host 127.0.0.1 # IP address of the remote brick
- option transport.socket.remote-port 7001 # default server port is 6996
- option transport.socket.nodelay on
- option remote-subvolume brick1 # name of the remote volume
-end-volume
-
-### Add client feature and attach to remote subvolume of server2
-volume client2
- type protocol/client
- option transport-type tcp # for TCP/IP transport
- option remote-host 127.0.0.1 # IP address of the remote brick
- option transport.socket.remote-port 7002 # default server port is 6996
- option transport.socket.nodelay on
- option remote-subvolume brick2 # name of the remote volume
-end-volume
-
-#volume client3
-# type protocol/client
-# option transport-type tcp # for TCP/IP transport
-# option remote-host 127.0.0.1 # IP address of the remote brick
-# option transport.socket.remote-port 6998 # default server port is 6996
-# option transport.socket.nodelay on
-# option remote-subvolume brick3 # name of the remote volume
-#end-volume
-
-## Add replicate feature.
-volume replicate
- type cluster/replicate
- subvolumes client1 client2
-end-volume
-
diff --git a/250/regr/spec_files/server1.vol b/250/regr/spec_files/server1.vol
deleted file mode 100644
index 6509f87..0000000
--- a/250/regr/spec_files/server1.vol
+++ /dev/null
@@ -1,34 +0,0 @@
-### 'NOTE'
-# This file has both server spec and client spec to get an understanding of stripe's spec file. Hence can't be used as it is, as a GlusterFS spec file.
-# One need to seperate out server spec and client spec to get it working.
-
-#=========================================================================
-
-# **** server1 spec file ****
-
-### Export volume "brick" with the contents of "/home/export" directory.
-volume posix1
- type storage/posix # POSIX FS translator
- option directory /root/regression/250/regr/export/export1
-end-volume
-
-### Add POSIX record locking support to the storage brick
-volume brick1
- type features/posix-locks
- option mandatory on # enables mandatory locking on all files
- subvolumes posix1
-end-volume
-
-### Add network serving capability to above brick.
-volume server
- type protocol/server
- option transport-type tcp # For TCP/IP transport
- option transport.socket.listen-port 7001 # Default is 6996
-# option transport.socket.nodelay on
-# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
- subvolumes brick1
- option auth.addr.brick1.allow * # access to "brick" volume
-end-volume
-
-
-#=========================================================================
diff --git a/250/regr/spec_files/server2.vol b/250/regr/spec_files/server2.vol
deleted file mode 100644
index aad45ad..0000000
--- a/250/regr/spec_files/server2.vol
+++ /dev/null
@@ -1,34 +0,0 @@
-### 'NOTE'
-# This file has both server spec and client spec to get an understanding of stripe's spec file. Hence can't be used as it is, as a GlusterFS spec file.
-# One need to seperate out server spec and client spec to get it working.
-
-#=========================================================================
-
-# **** server2 spec file ****
-
-### Export volume "brick" with the contents of "/home/export" directory.
-volume posix2
- type storage/posix # POSIX FS translator
- option directory /root/regression/250/regr/export/export2
-end-volume
-
-### Add POSIX record locking support to the storage brick
-volume brick2
- type features/posix-locks
- option mandatory on # enables mandatory locking on all files
- subvolumes posix2
-end-volume
-
-### Add network serving capability to above brick.
-volume server
- type protocol/server
- option transport-type tcp # For TCP/IP transport
- option transport.socket.listen-port 7002 # Default is 6996
-# option transport.socket.nodelay on
-# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
- subvolumes brick2
- option auth.addr.brick2.allow * # access to "brick" volume
-end-volume
-
-
-#=========================================================================
diff --git a/250/regr/spec_files/ss.sh b/250/regr/spec_files/ss.sh
deleted file mode 100755
index 39646ea..0000000
--- a/250/regr/spec_files/ss.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-(for j in {1..10} ; do for i in {1..10} ; do touch file$i ; setfattr -n trusted.user -v 2 file$i ; rm file$i ; done ; done)& > /dev/null
-PID1=$!
-
-(for k in {1..1000} ; do getfattr -n trusted.user * ; done)
-
-kill $PID1 \ No newline at end of file
diff --git a/250/regr/testcase b/250/regr/testcase
deleted file mode 100755
index ef07872..0000000
--- a/250/regr/testcase
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-description="# Crash in replicate getxattr "
-comments="# When setfattr and getfattr on a set of files are being done simultaneously then whenever getfattr is done on a file not present then the client crashes "
-
-source ../../init
-
-start_glusterfs
-
-sleep 5
-
-
-cd $MOUNTDIR/client1
-
-$SPECDIR/ss.sh 2> $SPECDIR/tmpfile
-if [ $(grep "Transport endpoint is not connected" $SPECDIR/tmpfile | wc -l) -ne 0 ]; then
- not_ok $description
- comment $comments
-else
- ok $description
- comment $comments
-fi
-
-cd -
-
-rm $SPECDIR/tmpfile
-
-cleanup_glusterfs
-
-if [ $(mount | grep "$MOUNTDIR/client1" | wc -l) -ne 0 ]; then
- umount $MOUNTDIR/client1
- rm -r $MOUNTDIR
-fi \ No newline at end of file
diff --git a/26/regr/spec_files/client1.vol b/26/regr/spec_files/client1.vol
deleted file mode 100644
index b92da11..0000000
--- a/26/regr/spec_files/client1.vol
+++ /dev/null
@@ -1,9 +0,0 @@
-volume client1
- type protocol/client
- option transport-type tcp
- option remote-port 9320
- option remote-host 127.0.0.1
- option remote-subvolume brick
-end-volume
-
-
diff --git a/26/regr/spec_files/server1.vol b/26/regr/spec_files/server1.vol
deleted file mode 100644
index cf254c7..0000000
--- a/26/regr/spec_files/server1.vol
+++ /dev/null
@@ -1,24 +0,0 @@
-volume posix
- type storage/posix
- option directory /jbod/regr/26/export1
-end-volume
-
-volume locks
- type features/locks
- subvolumes posix
-end-volume
-
-volume brick
- type performance/io-threads
- option thread-count 8
- subvolumes locks
-end-volume
-
-volume server
- type protocol/server
- option transport-type tcp
- option listen-port 9320
- option auth.addr.brick.allow *
- subvolumes brick
-end-volume
-
diff --git a/26/regr/testcase b/26/regr/testcase
deleted file mode 100755
index e2595a5..0000000
--- a/26/regr/testcase
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2006-2009 Gluster, Inc. <http://www.gluster.com>
-# This file is part of GlusterFS.
-#
-# GlusterFS is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# GlusterFS is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
-
-description="# (26) Version mismatch not handled correctly"
-comments="# Tried connecting 2.0.2 client with different version server"
-
-source ../../init
-
-start_glusterfs --no-clients
-
-/opt/glusterfs/2.0.2/sbin/glusterfs -f $SPECDIR/client1.vol -l $LOGDIR/$(hostname)-client1.log $MOUNTDIR/client1
-
-sleep 5
-
-for var in `seq 1 100`; do
- ls $MOUNTDIR/client1 2> tmpfile
- if [ $(grep "Transport endpoint is not connected" tmpfile | wc -l) -ne 0 ];then
- not_ok $description
- comment $comments
- break
- fi
-done
-rm tmpfile
-
-[ $var -eq 100 ] && ok $description
-
-umount -l $MOUNTDIR/client1
-cleanup_glusterfs
diff --git a/init b/init
index b6a8351..b762fb8 100644
--- a/init
+++ b/init
@@ -18,6 +18,7 @@
#
set -u
DESC=0
+BUGID=$(pwd | xargs dirname | xargs basename)
function ok ()
{
@@ -57,7 +58,6 @@ echo "Unable to determine version of $GLUSTERFS"
exit
fi
-BUGID=$(pwd | xargs dirname | xargs basename)
STARTDIR=$(pwd)
LOGDIR=$PWD/logs/$VERSION
GLUSTERFSDIR=`dirname $GLUSTERFS`
@@ -87,7 +87,10 @@ function revert_exportdir ()
function comment ()
{
desc=$@
- echo "$desc"
+ if [ $DESC -ne "0" ]
+ then
+ echo "$desc"
+ fi
}
function start_glusterfs ()
@@ -101,9 +104,10 @@ function stop_glusterfs ()
{
cd $STARTDIR
# Kill the clients
- for i in `ls -d $MOUNTDIR/client*`
+ sudo pkill -f "$GLUSTERFSDIR/glusterfs --run-id regr-$BUGID-$VERSION-c" 2>/dev/null
+ for i in `ls $MOUNTDIR/ 2>/dev/null`
do
- sudo umount $i 2>/dev/null
+ sudo umount $MOUNTDIR/$i 1>&2 2>/dev/null
done
# Kill the servers later
sudo pkill -f "$GLUSTERFSDIR/glusterfsd --run-id regr-$BUGID-$VERSION-s"
diff --git a/setup b/setup
index 9930149..da0d8cc 100755
--- a/setup
+++ b/setup
@@ -134,9 +134,9 @@ sub error (@) {
sub version () {
print <<__VERSION__;
$_ME ($_PACKAGE) $_VERSION
-Written by Gururaj K.
+Written by GlusterFS development team.
-Copyright (C) $_COPYRIGHT_YEARS Gururaj K.
+Copyright (C) $_COPYRIGHT_YEARS GlusterFS development team.
__VERSION__
quit (0);
}