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>

1 files changed, 29 insertions, 10 deletions

diff --git a/tests/bugs/bug-977797.t b/tests/bugs/bug-977797.t
index f2252159a..08cdbe8f1 100755
--- a/tests/bugs/bug-977797.t
+++ b/tests/bugs/bug-977797.t
@@ -54,7 +54,7 @@ TEST chmod 757 $M0/a/file
 TEST $CLI volume start $V0 force
 EXPECT_WITHIN 20 "1" afr_child_up_status $V0 1;
 
-TEST dd if=$M0/a/file of=/dev/null bs=1M
+TEST ls   -l $M0/a/file
 
 b1c0dir=$(afr_get_specific_changelog_xattr $B0/$V0"1"/a \
           trusted.afr.$V0-client-0 "entry")
@@ -75,15 +75,34 @@ b2c0f=$(afr_get_specific_changelog_xattr $B0/$V0"2"/a/file \
 b2c1f=$(afr_get_specific_changelog_xattr $B0/$V0"2"/a/file \
         trusted.afr.$V0-client-1 "data")
 
-EXPECT "00000000|^$" echo $b1c0f
-EXPECT "00000000|^$" echo $b1c1f
-EXPECT "00000000|^$" echo $b2c0f
-EXPECT "00000000|^$" echo $b2c1f
-
-EXPECT "00000000|^$" echo $b1c0dir
-EXPECT "00000000|^$" echo $b1c1dir
-EXPECT "00000000|^$" echo $b2c0dir
-EXPECT "00000000|^$" echo $b2c1dir
+EXPECT "00000000" echo $b1c0f
+EXPECT "00000000" echo $b1c1f
+EXPECT "00000000" echo $b2c0f
+EXPECT "00000000" echo $b2c1f
+
+EXPECT "00000000" echo $b1c0dir
+EXPECT "00000000" echo $b1c1dir
+EXPECT "00000000" echo $b2c0dir
+EXPECT "00000000" echo $b2c1dir
+
+contains() {
+    string="$1"
+    substring="$2"
+    var="-1"
+    if test "${string#*$substring}" != "$string"
+    then
+        var="0"    # $substring is in $string
+    else
+        var="1"    # $substring is not in $string
+    fi
+    echo $var
+}
+
+var1=$(cat $M0/a/file 2>&1)
+var2="Input/output error"
+
+
+EXPECT "0" contains "$var1" "$var2"
 
 ## Finish up
 TEST $CLI volume stop $V0;