Merge branch 'upstream' into merge

Signed-off-by: Jeff Darcy <jdarcy@redhat.com>

Conflicts:
	api/src/glfs-fops.c
	libglusterfs/src/syncop.c
	libglusterfs/src/syncop.h

Change-Id: I8c3fa7a20fb167d9e6bc2749e177c0c8b366827b

2 files changed, 39 insertions, 5 deletions

diff --git a/tests/basic/cdc.t b/tests/basic/cdc.t
index 69f39f7d1..70d2171a8 100755
--- a/tests/basic/cdc.t
+++ b/tests/basic/cdc.t
@@ -21,18 +21,16 @@ EXPECT 'off' volinfo_field $V0 'performance.io-cache'
 TEST $CLI volume set $V0 performance.quick-read off
 EXPECT 'off' volinfo_field $V0 'performance.quick-read'
 
-TEST $CLI volume set $V0 strict-write-ordering on
+TEST $CLI volume set $V0 performance.strict-write-ordering on
 EXPECT 'on' volinfo_field $V0 'performance.strict-write-ordering'
 
 ## Turn on cdc xlator by setting network.compression to on
 TEST $CLI volume set $V0 network.compression on
 EXPECT 'on' volinfo_field $V0 'network.compression'
-EXPECT 'server' volinfo_field $V0 'network.compression.mode'
 
 ## Make sure that user cannot change network.compression.mode
 ## This would break the cdc xlator if allowed!
-TEST $CLI volume set $V0 network.compression.mode client
-EXPECT 'server' volinfo_field $V0 'network.compression.mode'
+TEST ! $CLI volume set $V0 network.compression.mode client
 
 ## Turn on network.compression.debug option
 ## This will dump compressed data onto disk as gzip file
@@ -44,6 +42,7 @@ EXPECT 'on' volinfo_field $V0 'network.compression.debug'
 TEST $CLI volume start $V0;
 EXPECT 'Started' volinfo_field $V0 'Status';
 
+sleep 2
 ## Mount FUSE with caching disabled
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 
@@ -121,7 +120,6 @@ TEST umount $M0
 ## Reset the network.compression options
 TEST $CLI volume reset $V0 network.compression.debug
 TEST $CLI volume reset $V0 network.compression.min-size
-TEST $CLI volume reset $V0 network.compression.mode
 TEST $CLI volume reset $V0 network.compression
 
 ## Stop the volume
diff --git a/tests/basic/pgfid-feat.t b/tests/basic/pgfid-feat.t
new file mode 100644
index 000000000..8784cc7bf
--- /dev/null
+++ b/tests/basic/pgfid-feat.t
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+
+cleanup;
+
+function get_ancestry_path() {
+	local path=$1
+	local ancestry=$(getfattr --absolute-names -e text -n glusterfs.ancestry.path "$M0/$path" | grep "^glusterfs.ancestry.path" | cut -d"=" -f2 | tr -d \");
+	echo $ancestry;
+}
+
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume info;
+
+TEST $CLI volume create $V0 replica 2  $H0:$B0/${V0}{1,2,3,4};
+TEST $CLI volume start $V0;
+TEST glusterfs -s $H0 --volfile-id $V0 $M0;
+
+TEST $CLI volume set $V0 build-pgfid on;
+
+TEST mkdir $M0/a;
+TEST touch $M0/a/b;
+
+getfattr -e text -n glusterfs.ancestry.path "$M0/a/b" | grep "^glusterfs.ancestry.path" | cut -d"=" -f2 | tr -d \";
+EXPECT "/a/b" get_ancestry_path "/a/b";
+
+TEST $CLI volume set $V0 build-pgfid off;
+TEST ! getfattr -e text -n "glusterfs.ancestry.path" $M0/a/b;
+
+TEST $CLI volume stop $V0;
+TEST $CLI volume delete $V0;
+
+cleanup;