Repository: hadoop Updated Branches: refs/heads/branch-2 b705d9d0a -> c951d5655 refs/heads/trunk e1b1d7e4a -> 695577126
HDFS-9069. TestNameNodeMetricsLogger failing -port in use. (stevel) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c951d565 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c951d565 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c951d565 Branch: refs/heads/branch-2 Commit: c951d56556053aa1d14d2481d1904932ef69c018 Parents: b705d9d Author: Steve Loughran <[email protected]> Authored: Mon Sep 14 10:36:34 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Mon Sep 14 10:36:34 2015 +0100 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c951d565/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 2d5a31e..dff5174 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -975,6 +975,9 @@ Release 2.8.0 - UNRELEASED HDFS-9041. Move entries in META-INF/services/o.a.h.fs.FileSystem to hdfs-client. (Mingliang Liu via wheat9) + HDFS-9069. TestNameNodeMetricsLogger failing -port in use. + (stevel) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/c951d565/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java index c8dc6ec..6968bc4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMetricsLogger.java @@ -25,6 +25,7 @@ import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.metrics2.util.MBeans; +import org.apache.hadoop.net.ServerSocketUtil; import org.apache.hadoop.test.GenericTestUtils; import org.apache.log4j.Appender; import org.apache.log4j.AppenderSkeleton; @@ -118,8 +119,8 @@ public class TestNameNodeMetricsLogger { return new TestNameNode(conf); } - private int getRandomPort() { - return 10000 + random.nextInt(50000); + private int getRandomPort() throws IOException { + return ServerSocketUtil.getPort(0, 10); } private void addAppender(Log log, Appender appender) {
