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 cm...@apache.org on 2015/01/13 02:07:45 UTC

hadoop git commit: HDFS-7598. Remove dependency on old version of Guava in TestDFSClientCache#testEviction (Sangjin Lee via Colin P. McCabe)

Repository: hadoop
Updated Branches:
  refs/heads/trunk f3507fa35 -> b3ddd7ee3


HDFS-7598. Remove dependency on old version of Guava in TestDFSClientCache#testEviction (Sangjin Lee via Colin P. McCabe)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b3ddd7ee
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b3ddd7ee
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b3ddd7ee

Branch: refs/heads/trunk
Commit: b3ddd7ee39c92d2df8661ce5834a2831020cecb2
Parents: f3507fa
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Mon Jan 12 17:07:18 2015 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Mon Jan 12 17:07:18 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java     | 5 +++--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                     | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b3ddd7ee/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java
index 6536cd8..54b7ee7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java
@@ -39,7 +39,7 @@ public class TestDFSClientCache {
     conf.set(FileSystem.FS_DEFAULT_NAME_KEY, "hdfs://localhost");
 
     // Only one entry will be in the cache
-    final int MAX_CACHE_SIZE = 2;
+    final int MAX_CACHE_SIZE = 1;
 
     DFSClientCache cache = new DFSClientCache(conf, MAX_CACHE_SIZE);
 
@@ -50,7 +50,8 @@ public class TestDFSClientCache {
 
     cache.getDfsClient("test2");
     assertTrue(isDfsClientClose(c1));
-    assertEquals(MAX_CACHE_SIZE - 1, cache.clientCache.size());
+    assertTrue("cache size should be the max size or less",
+        cache.clientCache.size() <= MAX_CACHE_SIZE);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b3ddd7ee/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 05cb745..b57503a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -493,6 +493,9 @@ Release 2.7.0 - UNRELEASED
     HDFS-7326: Add documentation for hdfs debug commands (Vijay Bhat via Colin
     P. McCabe)
 
+    HDFS-7598. Remove dependency on old version of guava in
+    TestDFSClientCache#testEviction. (Sangjin Lee via Colin P. McCabe)
+
   OPTIMIZATIONS
 
     HDFS-7454. Reduce memory footprint for AclEntries in NameNode.