move 'xlators/marker/utils/' to 'geo-replication/' directory
Change-Id: Ibd0faefecc15b6713eda28bc96794ae58aff45aa BUG: 847839 Original Author: Amar Tumballi <amarts@redhat.com> Signed-off-by: Avra Sengupta <asengupt@redhat.com> Reviewed-on: http://review.gluster.org/5133 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Avra Sengupta
Vijay Bellur
parent
11f6c56f83
commit
950371be29
@ -6,7 +6,7 @@ EXTRA_DIST = autogen.sh \
|
||||
gen-headers.py
|
||||
|
||||
SUBDIRS = argp-standalone libglusterfs rpc api xlators glusterfsd \
|
||||
$(FUSERMOUNT_SUBDIR) doc extras cli
|
||||
$(FUSERMOUNT_SUBDIR) doc extras cli @SYNCDAEMON_SUBDIR@
|
||||
|
||||
pkgconfigdir = @pkgconfigdir@
|
||||
pkgconfig_DATA = glusterfs-api.pc libgfchangelog.pc
|
||||
@ -20,7 +20,9 @@ gitclean: distclean
|
||||
rm -fr autom4te.cache
|
||||
rm -f missing aclocal.m4 config.h.in config.guess config.sub ltmain.sh install-sh configure depcomp
|
||||
rm -fr argp-standalone/autom4te.cache
|
||||
rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in argp-standalone/configure argp-standalone/depcomp argp-standalone/install-sh argp-standalone/missing
|
||||
rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in
|
||||
rm -f argp-standalone/configure argp-standalone/depcomp
|
||||
rm -f argp-standalone/install-sh argp-standalone/missing
|
||||
|
||||
dist-hook:
|
||||
(cd $(srcdir) && git diff && echo ===== git log ==== && git log) > $(distdir)/ChangeLog
|
||||
|
||||
@ -107,9 +107,6 @@ AC_CONFIG_FILES([Makefile
|
||||
xlators/features/quota/src/Makefile
|
||||
xlators/features/marker/Makefile
|
||||
xlators/features/marker/src/Makefile
|
||||
xlators/features/marker/utils/Makefile
|
||||
xlators/features/marker/utils/src/Makefile
|
||||
xlators/features/marker/utils/syncdaemon/Makefile
|
||||
xlators/features/read-only/Makefile
|
||||
xlators/features/read-only/src/Makefile
|
||||
xlators/features/mac-compat/Makefile
|
||||
@ -158,6 +155,9 @@ AC_CONFIG_FILES([Makefile
|
||||
libgfchangelog.pc
|
||||
api/Makefile
|
||||
api/src/Makefile
|
||||
geo-replication/Makefile
|
||||
geo-replication/src/Makefile
|
||||
geo-replication/syncdaemon/Makefile
|
||||
glusterfs.spec])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
@ -422,7 +422,7 @@ case $host_os in
|
||||
esac
|
||||
SYNCDAEMON_COMPILE=0
|
||||
if test "x$enable_georeplication" != "xno"; then
|
||||
SYNCDAEMON_SUBDIR=utils
|
||||
SYNCDAEMON_SUBDIR=geo-replication
|
||||
SYNCDAEMON_COMPILE=1
|
||||
|
||||
BUILD_SYNCDAEMON="yes"
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
. $(dirname $0)/../include.rc
|
||||
|
||||
cleanup;
|
||||
|
||||
function georep_start_and_check()
|
||||
{
|
||||
local master=$1
|
||||
local slave=$2
|
||||
|
||||
$CLI volume geo-replication $master $slave start
|
||||
}
|
||||
|
||||
function georep_stop()
|
||||
{
|
||||
local master=$1
|
||||
local slave=$2
|
||||
|
||||
$CLI volume geo-replication $master $slave stop
|
||||
}
|
||||
|
||||
TEST glusterd
|
||||
TEST pidof glusterd
|
||||
TEST $CLI volume create $V0 $H0:$B0/brick0 $H0:$B0/brick1
|
||||
TEST $CLI volume start $V0
|
||||
|
||||
sleep 5
|
||||
|
||||
slave=`mktemp -d`
|
||||
mkdir -p $slave
|
||||
|
||||
# check normal functionality of geo-replication
|
||||
EXPECT_KEYWORD "successful" georep_start_and_check $V0 $slave
|
||||
TEST georep_stop $V0 $slave
|
||||
|
||||
# now invoke replace brick
|
||||
TEST $CLI volume replace-brick $V0 $H0:$B0/brick1 $H0:$B0/brick2 start
|
||||
|
||||
# check if CLI refuses to start geo replication
|
||||
EXPECT_KEYWORD "failed" georep_start_and_check $V0 $slave
|
||||
|
||||
# commit replace brick operation
|
||||
TEST $CLI volume replace-brick $V0 $H0:$B0/brick1 $H0:$B0/brick2 commit
|
||||
|
||||
# geo replication should work as usual
|
||||
EXPECT_KEYWORD "successful" georep_start_and_check $V0 $slave
|
||||
TEST georep_stop $V0 $slave
|
||||
|
||||
rm -rf $slave
|
||||
cleanup
|
||||
@ -1,20 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
. $(dirname $0)/../include.rc
|
||||
|
||||
cleanup;
|
||||
|
||||
|
||||
TEST glusterd
|
||||
TEST pidof glusterd
|
||||
TEST $CLI volume create $V0 $H0:$B0/brick0
|
||||
TEST $CLI volume start $V0
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave start --xml | xmllint --format -"
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave stop --xml | xmllint --format -"
|
||||
|
||||
TEST $CLI volume stop $V0
|
||||
|
||||
cleanup;
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
. $(dirname $0)/../include.rc
|
||||
|
||||
cleanup;
|
||||
|
||||
|
||||
TEST glusterd
|
||||
TEST pidof glusterd
|
||||
TEST $CLI volume create $V0 $H0:$B0/brick0
|
||||
TEST $CLI volume start $V0
|
||||
|
||||
TEST "mkdir $B0/slave"
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave start --xml | xmllint --format -"
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave2 start --xml | xmllint --format -"
|
||||
|
||||
TEST "$CLI volume geo-replication status --xml | xmllint --format -"
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave status --xml | xmllint --format -"
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave2 status --xml | xmllint --format -"
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave stop --xml | xmllint --format -"
|
||||
|
||||
TEST "$CLI volume geo-replication $V0 $B0/slave2 stop --xml | xmllint --format -"
|
||||
|
||||
TEST $CLI volume stop $V0
|
||||
|
||||
TEST "rmdir $B0/slave"
|
||||
|
||||
cleanup;
|
||||
@ -1,48 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
. $(dirname $0)/../include.rc
|
||||
|
||||
cleanup;
|
||||
|
||||
TEST glusterd
|
||||
TEST pidof glusterd
|
||||
TEST $CLI volume info;
|
||||
|
||||
function volinfo_field()
|
||||
{
|
||||
local vol=$1;
|
||||
local field=$2;
|
||||
|
||||
$CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
|
||||
}
|
||||
|
||||
TEST $CLI volume create $V0 $H0:$B0/brick1;
|
||||
EXPECT 'Created' volinfo_field $V0 'Status';
|
||||
|
||||
TEST $CLI volume start $V0;
|
||||
EXPECT 'Started' volinfo_field $V0 'Status';
|
||||
|
||||
## Wait for volume to register with rpc.mountd
|
||||
sleep 5;
|
||||
|
||||
#mount on a random dir
|
||||
TEST MOUNTDIR="/tmp/$RANDOM"
|
||||
TEST mkdir $MOUNTDIR
|
||||
TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $MOUNTDIR;
|
||||
flag=0
|
||||
|
||||
TEST touch $MOUNTDIR/testfile
|
||||
|
||||
TEST GEOREPDIR="/tmp/$RANDOM"
|
||||
TEST mkdir $GEOREPDIR
|
||||
|
||||
TEST $CLI volume geo-replication $V0 file:///$GEOREPDIR start
|
||||
|
||||
for i in {1..500}; do cat /etc/passwd >> $MOUNTDIR/testfile; if [ $? -ne 0 ]; then flag=1; break; fi; done
|
||||
TEST [ $flag -eq 0 ]
|
||||
TEST rm -rf $GEOREPDIR
|
||||
|
||||
TEST umount $MOUNTDIR
|
||||
TEST rm -rf $MOUNTDIR
|
||||
|
||||
cleanup;
|
||||
@ -1,3 +1,3 @@
|
||||
SUBDIRS = src @SYNCDAEMON_SUBDIR@
|
||||
SUBDIRS = src
|
||||
|
||||
CLEANFILES =
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user