summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorNithya Balachandran <nbalacha@redhat.com>2015-08-27 13:10:18 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2015-08-31 00:27:40 -0700
commitb9c730f3960efd454c8363ee39dc144e4c0dc835 (patch)
treee8e1895e404f8e47da964d56f2126daefe143885 /tests/basic
parentbeb7abe8762ad73de104f0707949a09af847464d (diff)
cluster/dht: Don't set posix acls on linkto files
Posix acls on a linkto file change the file's permission bits and cause DHT to treat it as a non-linkto file.This happens on the migration failure of a file on which posix acls were set. The fix prevents posix acls from being set on a linkto file and copies them across only after a file has been successfully migrated. Change-Id: Iccf7ff6fba49fe05d691d9b83bf76a240848b212 BUG: 1247563 Signed-off-by: Nithya Balachandran <nbalacha@redhat.com> Signed-off-by: N Balachandran <nbalacha@redhat.com> Reviewed-on: http://review.gluster.org/12025 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'tests/basic')
-rwxr-xr-xtests/basic/tier/tier.t2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t
index e8f17f32473..3b0b0bf280b 100755
--- a/tests/basic/tier/tier.t
+++ b/tests/basic/tier/tier.t
@@ -199,7 +199,7 @@ cat d1/data3.txt
sleep $PROMOTE_TIMEOUT
sleep $DEMOTE_FREQ
-EXPECT "0" check_counters 2 6
+EXPECT_WITHIN $DEMOTE_TIMEOUT "0" check_counters 2 6
# stop gluster, when it comes back info file should have tiered volume
killall glusterd