YARN-3433. Jersey tests failing with Port in Use -again. (Brahma Reddy Battula)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf2f2b4f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf2f2b4f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf2f2b4f Branch: refs/heads/YARN-1197 Commit: bf2f2b4fc436ea5990e6fc78eb18091b9458e75a Parents: 08024d1 Author: Steve Loughran <[email protected]> Authored: Wed Sep 16 10:30:49 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Wed Sep 16 10:31:02 2015 +0100 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/yarn/webapp/JerseyTestBase.java | 14 +++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf2f2b4f/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index c5143ff..e5cb40e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -928,6 +928,9 @@ Release 2.7.2 - UNRELEASED YARN-4158. Remove duplicate close for LogWriter in AppLogAggregatorImpl#uploadLogsForContainers (Zhihai Xu via jlowe) + YARN-3433. Jersey tests failing with Port in Use -again. + (Brahma Reddy Battula) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf2f2b4f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java index 0b177f9..7a225a3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java @@ -18,6 +18,9 @@ package org.apache.hadoop.yarn.webapp; +import java.io.IOException; + +import org.apache.hadoop.net.ServerSocketUtil; import org.junit.Before; import com.sun.jersey.test.framework.JerseyTest; import com.sun.jersey.test.framework.WebAppDescriptor; @@ -28,15 +31,8 @@ public abstract class JerseyTestBase extends JerseyTest { } @Before - public void initializeJerseyPort() { - int jerseyPort = 9998; - String port = System.getProperty("jersey.test.port"); - if(null != port) { - jerseyPort = Integer.parseInt(port) + 10; - if(jerseyPort > 65535) { - jerseyPort = 9998; - } - } + public void initializeJerseyPort() throws IOException { + int jerseyPort = ServerSocketUtil.getPort(9998, 10); System.setProperty("jersey.test.port", Integer.toString(jerseyPort)); } }
