You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2013/10/27 19:43:59 UTC
svn commit: r1536182 - in
/hadoop/common/branches/HDFS-2832/hadoop-common-project:
hadoop-common/CHANGES.txt
hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java
Author: arp
Date: Sun Oct 27 18:43:58 2013
New Revision: 1536182
URL: http://svn.apache.org/r1536182
Log:
Merging r1535792 through r1536181 from trunk to HDFS-2832.
Modified:
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java
Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1536182&r1=1536181&r2=1536182&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt Sun Oct 27 18:43:58 2013
@@ -449,6 +449,9 @@ Release 2.2.1 - UNRELEASED
HADOOP-10055. FileSystemShell.apt.vm doc has typo "numRepicas".
(Akira Ajisaka via cnauroth)
+ HADOOP-10072. TestNfsExports#testMultiMatchers fails due to non-deterministic
+ timing around cache expiry check. (cnauroth)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1535792-1536181
Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java?rev=1536182&r1=1536181&r2=1536182&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/TestNfsExports.java Sun Oct 27 18:43:58 2013
@@ -35,6 +35,7 @@ public class TestNfsExports {
Nfs3Constant.EXPORTS_CACHE_EXPIRYTIME_MILLIS_DEFAULT * 1000 * 1000;
private static final int CacheSize = Nfs3Constant.EXPORTS_CACHE_SIZE_DEFAULT;
+ private static final long NanosPerMillis = 1000000;
@Test
public void testWildcardRW() {
@@ -185,7 +186,15 @@ public class TestNfsExports {
Thread.sleep(1000);
// no cache for address2 now
- Assert.assertEquals(AccessPrivilege.NONE,
- matcher.getAccessPrivilege(address2, address2));
+ AccessPrivilege ap;
+ long startNanos = System.nanoTime();
+ do {
+ ap = matcher.getAccessPrivilege(address2, address2);
+ if (ap == AccessPrivilege.NONE) {
+ break;
+ }
+ Thread.sleep(500);
+ } while ((System.nanoTime() - startNanos) / NanosPerMillis < 5000);
+ Assert.assertEquals(AccessPrivilege.NONE, ap);
}
}