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 br...@apache.org on 2016/09/27 01:35:33 UTC
hadoop git commit: HDFS-9444. Add utility to find set of available
ephemeral ports to ServerSocketUtil. Contributed by Masatake Iwasaki
Repository: hadoop
Updated Branches:
refs/heads/trunk 059058f96 -> edf0d0f8b
HDFS-9444. Add utility to find set of available ephemeral ports to ServerSocketUtil. Contributed by Masatake Iwasaki
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/edf0d0f8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/edf0d0f8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/edf0d0f8
Branch: refs/heads/trunk
Commit: edf0d0f8b2115d4edb5d4932b5ecb15430d94c40
Parents: 059058f
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Sep 27 07:04:37 2016 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Sep 27 07:04:37 2016 +0530
----------------------------------------------------------------------
.../org/apache/hadoop/net/ServerSocketUtil.java | 23 +++++++++++
.../server/namenode/TestNameNodeMXBean.java | 34 +++++++++++-----
.../server/namenode/ha/TestEditLogTailer.java | 42 +++++++++++++-------
3 files changed, 75 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/edf0d0f8/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
index 023c1ed..a294e74 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
@@ -102,4 +102,27 @@ public class ServerSocketUtil {
}
}
}
+
+ /**
+ * Find the specified number of unique ports available.
+ * The ports are all closed afterwards,
+ * so other network services started may grab those same ports.
+ *
+ * @param numPorts number of required port nubmers
+ * @return array of available port numbers
+ * @throws IOException
+ */
+ public static int[] getPorts(int numPorts) throws IOException {
+ ServerSocket[] sockets = new ServerSocket[numPorts];
+ int[] ports = new int[numPorts];
+ for (int i = 0; i < numPorts; i++) {
+ ServerSocket sock = new ServerSocket(0);
+ sockets[i] = sock;
+ ports[i] = sock.getLocalPort();
+ }
+ for (ServerSocket sock : sockets) {
+ sock.close();
+ }
+ return ports;
+ }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/edf0d0f8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
index dc8bea7..ac97a36 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
@@ -47,6 +47,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import java.io.File;
import java.lang.management.ManagementFactory;
+import java.net.BindException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
@@ -59,6 +60,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Class for testing {@link NameNodeMXBean} implementation
@@ -431,17 +433,29 @@ public class TestNameNodeMXBean {
public void testNNDirectorySize() throws Exception{
Configuration conf = new Configuration();
conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1);
- // Have to specify IPC ports so the NNs can talk to each other.
- MiniDFSNNTopology topology = new MiniDFSNNTopology()
- .addNameservice(new MiniDFSNNTopology.NSConf("ns1")
- .addNN(new MiniDFSNNTopology.NNConf("nn1")
- .setIpcPort(ServerSocketUtil.getPort(0, 100)))
- .addNN(new MiniDFSNNTopology.NNConf("nn2")
- .setIpcPort(ServerSocketUtil.getPort(0, 100))));
+ MiniDFSCluster cluster = null;
+ for (int i = 0; i < 5; i++) {
+ try{
+ // Have to specify IPC ports so the NNs can talk to each other.
+ int[] ports = ServerSocketUtil.getPorts(2);
+ MiniDFSNNTopology topology = new MiniDFSNNTopology()
+ .addNameservice(new MiniDFSNNTopology.NSConf("ns1")
+ .addNN(new MiniDFSNNTopology.NNConf("nn1").setIpcPort(ports[0]))
+ .addNN(
+ new MiniDFSNNTopology.NNConf("nn2").setIpcPort(ports[1])));
- MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
- .nnTopology(topology).numDataNodes(0)
- .build();
+ cluster = new MiniDFSCluster.Builder(conf)
+ .nnTopology(topology).numDataNodes(0)
+ .build();
+ break;
+ } catch (BindException e) {
+ // retry if race on ports given by ServerSocketUtil#getPorts
+ continue;
+ }
+ }
+ if (cluster == null) {
+ fail("failed to start mini cluster.");
+ }
FileSystem fs = null;
try {
cluster.waitActive();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/edf0d0f8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java
index 0d0873d..5a2aff9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when;
import java.io.File;
import java.io.IOException;
+import java.net.BindException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
@@ -165,21 +166,34 @@ public class TestEditLogTailer {
conf.setInt(DFSConfigKeys.DFS_HA_LOGROLL_PERIOD_KEY, 1);
conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1);
conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_ALL_NAMESNODES_RETRY_KEY, 100);
-
- // Have to specify IPC ports so the NNs can talk to each other.
- MiniDFSNNTopology topology = new MiniDFSNNTopology()
- .addNameservice(new MiniDFSNNTopology.NSConf("ns1")
- .addNN(new MiniDFSNNTopology.NNConf("nn1")
- .setIpcPort(ServerSocketUtil.getPort(0, 100)))
- .addNN(new MiniDFSNNTopology.NNConf("nn2")
- .setIpcPort(ServerSocketUtil.getPort(0, 100)))
- .addNN(new MiniDFSNNTopology.NNConf("nn3")
- .setIpcPort(ServerSocketUtil.getPort(0, 100))));
- MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
- .nnTopology(topology)
- .numDataNodes(0)
- .build();
+ MiniDFSCluster cluster = null;
+ for (int i = 0; i < 5; i++) {
+ try {
+ // Have to specify IPC ports so the NNs can talk to each other.
+ int[] ports = ServerSocketUtil.getPorts(3);
+ MiniDFSNNTopology topology = new MiniDFSNNTopology()
+ .addNameservice(new MiniDFSNNTopology.NSConf("ns1")
+ .addNN(new MiniDFSNNTopology.NNConf("nn1")
+ .setIpcPort(ports[0]))
+ .addNN(new MiniDFSNNTopology.NNConf("nn2")
+ .setIpcPort(ports[1]))
+ .addNN(new MiniDFSNNTopology.NNConf("nn3")
+ .setIpcPort(ports[2])));
+
+ cluster = new MiniDFSCluster.Builder(conf)
+ .nnTopology(topology)
+ .numDataNodes(0)
+ .build();
+ break;
+ } catch (BindException e) {
+ // retry if race on ports given by ServerSocketUtil#getPorts
+ continue;
+ }
+ }
+ if (cluster == null) {
+ fail("failed to start mini cluster.");
+ }
try {
cluster.transitionToActive(activeIndex);
waitForLogRollInSharedDir(cluster, 3);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org