Repository: hadoop Updated Branches: refs/heads/branch-2 7a8ed154a -> 1a4bd5b16
HDFS-9270. TestShortCircuitLocalRead should not leave socket after unit test (Masatake Iwasaki via Colin P. McCabe) (cherry picked from commit 6381ddc096699d680233db3b9efff9321528eedc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a4bd5b1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a4bd5b1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a4bd5b1 Branch: refs/heads/branch-2 Commit: 1a4bd5b161fd85b89314ec7c7bbb9a540f1a1bb3 Parents: 7a8ed15 Author: Colin Patrick Mccabe <[email protected]> Authored: Tue Oct 20 10:51:18 2015 -0700 Committer: Colin Patrick Mccabe <[email protected]> Committed: Tue Oct 20 10:57:16 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java | 6 ++++-- .../hadoop/tracing/TestTracingShortCircuitLocalRead.java | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a4bd5b1/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 cf0ca76..bd38278 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1260,6 +1260,9 @@ Release 2.8.0 - UNRELEASED HDFS-9208. Disabling atime may fail clients like distCp. (Kihwal Lee via yliu) + HDFS-9270. TestShortCircuitLocalRead should not leave socket after unit + test (Masatake Iwasaki via Colin P. McCabe) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a4bd5b1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java index b6b8a49..e6ee7f3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/shortcircuit/TestShortCircuitLocalRead.java @@ -389,7 +389,8 @@ public class TestShortCircuitLocalRead { conf.setBoolean(HdfsClientConfigKeys.Read.ShortCircuit.KEY, true); conf.setBoolean(HdfsClientConfigKeys.Read.ShortCircuit.SKIP_CHECKSUM_KEY, false); conf.set(DFSConfigKeys.DFS_DOMAIN_SOCKET_PATH_KEY, - "/tmp/testSkipWithVerifyChecksum._PORT"); + new File(sockDir.getDir(), + "testSkipWithVerifyChecksum._PORT.sock").getAbsolutePath()); DomainSocket.disableBindPathValidation(); if (simulatedStorage) { SimulatedFSDataset.setFactory(conf); @@ -435,7 +436,8 @@ public class TestShortCircuitLocalRead { conf.setBoolean(HdfsClientConfigKeys.Read.ShortCircuit.KEY, true); conf.setBoolean(HdfsClientConfigKeys.Read.ShortCircuit.SKIP_CHECKSUM_KEY, false); conf.set(DFSConfigKeys.DFS_DOMAIN_SOCKET_PATH_KEY, - "/tmp/testHandleTruncatedBlockFile._PORT"); + new File(sockDir.getDir(), + "testHandleTruncatedBlockFile._PORT.sock").getAbsolutePath()); conf.set(DFSConfigKeys.DFS_CHECKSUM_TYPE_KEY, "CRC32C"); final Path TEST_PATH = new Path("/a"); final Path TEST_PATH2 = new Path("/b"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a4bd5b1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracingShortCircuitLocalRead.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracingShortCircuitLocalRead.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracingShortCircuitLocalRead.java index 292c68d..37c09d1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracingShortCircuitLocalRead.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTracingShortCircuitLocalRead.java @@ -19,6 +19,7 @@ package org.apache.hadoop.tracing; import static org.junit.Assume.assumeTrue; +import java.io.File; import java.io.IOException; import org.apache.hadoop.conf.Configuration; @@ -74,7 +75,8 @@ public class TestTracingShortCircuitLocalRead { conf.setBoolean(HdfsClientConfigKeys.Read.ShortCircuit.KEY, true); conf.setBoolean(HdfsClientConfigKeys.Read.ShortCircuit.SKIP_CHECKSUM_KEY, false); conf.set(DFSConfigKeys.DFS_DOMAIN_SOCKET_PATH_KEY, - "testShortCircuitTraceHooks._PORT"); + new File(sockDir.getDir(), + "testShortCircuitTraceHooks._PORT.sock").getAbsolutePath()); conf.set(DFSConfigKeys.DFS_CHECKSUM_TYPE_KEY, "CRC32C"); cluster = new MiniDFSCluster.Builder(conf) .numDataNodes(1)
