diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2014-04-03 11:47:28 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2014-04-03 21:32:52 -0700 |
| commit | 52aac0ae61913c6c6997f27710b6bfcf8ca73bce (patch) | |
| tree | 2d80239535469984f9c731915b2cdcdbec0d2125 /tests/bugs/bug-873962.t | |
| parent | 8596ecba074081d7843a6bea2299951db48aa3b5 (diff) | |
cluster/afr: Add the non-refactored afr code into the treedevelopment
Reverted all afr commits " 6d37392 - cluster/afr: refactor <Anand Avati>" and
upwards. The resulting afr code was moved to afr-v1 folder, resulting in
the following changes:
modified: libglusterfs/src/gf-dirent.c
modified: libglusterfs/src/glusterfs.h
modified: libglusterfs/src/xlator.c
modified: tests/basic/pump.t
modified: tests/bugs/859927/repl.t
modified: tests/bugs/bug-1015990-rep.t
modified: tests/bugs/bug-1035576.t
modified: tests/bugs/bug-1037501.t
modified: tests/bugs/bug-1058797.t
modified: tests/bugs/bug-767585-gfid.t
modified: tests/bugs/bug-802417.t
modified: tests/bugs/bug-830665.t
modified: tests/bugs/bug-853690.t
modified: tests/bugs/bug-865825.t
modified: tests/bugs/bug-873962.t
modified: tests/bugs/bug-888174.t
modified: tests/bugs/bug-906646.t
modified: tests/bugs/bug-913051.t
modified: tests/bugs/bug-913544.t
modified: tests/bugs/bug-918437-sh-mtime.t
modified: tests/bugs/bug-977797.t
modified: tests/volume.rc
new file: xlators/cluster/afr-v1/Makefile.am
new file: xlators/cluster/afr-v1/src/Makefile.am
new file: xlators/cluster/afr-v1/src/afr-common.c
new file: xlators/cluster/afr-v1/src/afr-dir-read.c
new file: xlators/cluster/afr-v1/src/afr-dir-read.h
new file: xlators/cluster/afr-v1/src/afr-dir-write.c
new file: xlators/cluster/afr-v1/src/afr-dir-write.h
new file: xlators/cluster/afr-v1/src/afr-inode-read.c
new file: xlators/cluster/afr-v1/src/afr-inode-read.h
new file: xlators/cluster/afr-v1/src/afr-inode-write.c
new file: xlators/cluster/afr-v1/src/afr-inode-write.h
new file: xlators/cluster/afr-v1/src/afr-lk-common.c
new file: xlators/cluster/afr-v1/src/afr-mem-types.h
new file: xlators/cluster/afr-v1/src/afr-open.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-algorithm.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-algorithm.h
new file: xlators/cluster/afr-v1/src/afr-self-heal-common.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-common.h
new file: xlators/cluster/afr-v1/src/afr-self-heal-data.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-entry.c
new file: xlators/cluster/afr-v1/src/afr-self-heal-metadata.c
new file: xlators/cluster/afr-v1/src/afr-self-heal.h
new file: xlators/cluster/afr-v1/src/afr-self-heald.c
new file: xlators/cluster/afr-v1/src/afr-self-heald.h
new file: xlators/cluster/afr-v1/src/afr-transaction.c
new file: xlators/cluster/afr-v1/src/afr-transaction.h
new file: xlators/cluster/afr-v1/src/afr.c
new file: xlators/cluster/afr-v1/src/afr.h
new file: xlators/cluster/afr-v1/src/pump.c
new file: xlators/cluster/afr-v1/src/pump.h
modified: xlators/cluster/dht/src/dht-common.c
modified: xlators/cluster/stripe/src/stripe.c
modified: xlators/features/index/src/index.c
modified: xlators/features/index/src/index.h
Also making changes to compile cluster/afr-v1 instead of cluster/afr :
modified: configure.ac
modified: xlators/cluster/Makefile.am
Change-Id: I3e33ac361e381f5475d1a58ea938d2676f6d5a2f
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/7388
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'tests/bugs/bug-873962.t')
| -rwxr-xr-x | tests/bugs/bug-873962.t | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/bugs/bug-873962.t b/tests/bugs/bug-873962.t index 0281417f0..b245cc3da 100755 --- a/tests/bugs/bug-873962.t +++ b/tests/bugs/bug-873962.t @@ -61,12 +61,11 @@ EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0 EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M1 --direct-io-mode=enable - #Files are in split-brain, so open should fail TEST ! cat $M0/a; TEST ! cat $M1/a; -TEST cat $M0/b; -TEST cat $M1/b; +TEST ! cat $M0/b; +TEST ! cat $M1/b; #Reset split-brain status TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/a; @@ -76,7 +75,6 @@ TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0 EXPECT "2" cat $M0/a; # FAIL HERE - see comment about cluster.self-heal-background-count above. EXPECT "2" cat $M1/a; -TEST dd if=$M0/b of=/dev/null bs=1M EXPECT "def" getfattr -n trusted.mdata --only-values $M0/b 2>/dev/null EXPECT "def" getfattr -n trusted.mdata --only-values $M1/b 2>/dev/null @@ -92,8 +90,8 @@ TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $ #Files are in split-brain, so open should fail TEST ! cat $M0/c TEST ! cat $M1/c -TEST cat $M0/d -TEST cat $M1/d +TEST ! cat $M0/d +TEST ! cat $M1/d TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/c TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000000000000000000000 $B0/${V0}1/d @@ -104,4 +102,7 @@ EXPECT "2" cat $M1/c EXPECT "1" cat $M0/d EXPECT "1" cat $M1/d +#Check that the self-heal is not triggered. +EXPECT "1" cat $B0/${V0}1/c +EXPECT "abc" getfattr -n trusted.mdata --only-values $B0/${V0}1/d 2>/dev/null cleanup; |