hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
Subject git commit: HDFS-7282. Fix intermittent TestShortCircuitCache and TestBlockReaderFactory failures resulting from TemporarySocketDirectory GC (Jinghui Wang via Colin P. McCabe)
Date Tue, 28 Oct 2014 00:44:43 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 00b4e44a2 -> 518a7f4af


HDFS-7282. Fix intermittent TestShortCircuitCache and TestBlockReaderFactory failures resulting
from TemporarySocketDirectory GC (Jinghui Wang 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/518a7f4a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/518a7f4a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/518a7f4a

Branch: refs/heads/trunk
Commit: 518a7f4af3d8deeecabfa0629b16521ce09de459
Parents: 00b4e44
Author: Colin Patrick Mccabe <cmccabe@cloudera.com>
Authored: Mon Oct 27 17:44:07 2014 -0700
Committer: Colin Patrick Mccabe <cmccabe@cloudera.com>
Committed: Mon Oct 27 17:44:07 2014 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                      | 4 ++++
 .../test/java/org/apache/hadoop/hdfs/TestBlockReaderFactory.java | 3 +++
 .../apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java   | 1 +
 3 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/518a7f4a/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 9646581..9db3535 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -349,6 +349,10 @@ Release 2.7.0 - UNRELEASED
     HDFS-7258. CacheReplicationMonitor rescan schedule log should use DEBUG
     level instead of INFO level. (Xiaoyu Yao via wheat9)
 
+    HDFS-7282. Fix intermittent TestShortCircuitCache and
+    TestBlockReaderFactory failures resulting from TemporarySocketDirectory GC.
+    (Jinghui Wang via Colin Patrick McCabe)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/518a7f4a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockReaderFactory.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockReaderFactory.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockReaderFactory.java
index a7dcbc1..5c330cd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockReaderFactory.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockReaderFactory.java
@@ -343,6 +343,7 @@ public class TestBlockReaderFactory {
       }
     });
     cluster.shutdown();
+    sockDir.close();
   }
  
   /**
@@ -378,6 +379,7 @@ public class TestBlockReaderFactory {
         fs.dfs.getClientContext().getShortCircuitCache();
     Assert.assertEquals(null, cache.getDfsClientShmManager());
     cluster.shutdown();
+    sockDir.close();
   }
   
   /**
@@ -411,6 +413,7 @@ public class TestBlockReaderFactory {
     Assert.assertTrue(cache.getDfsClientShmManager().
         getDomainSocketWatcher().isClosed());
     cluster.shutdown();
+    sockDir.close();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/hadoop/blob/518a7f4a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
index ca30e02..bfa871c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitCache.java
@@ -519,6 +519,7 @@ public class TestShortCircuitCache {
       }
     });
     cluster.shutdown();
+    sockDir.close();
   }
 
   /**


Mime
View raw message