Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1D4B9200D04 for ; Mon, 11 Sep 2017 08:48:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1BE861609C8; Mon, 11 Sep 2017 06:48:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 134311609C3 for ; Mon, 11 Sep 2017 08:48:42 +0200 (CEST) Received: (qmail 70607 invoked by uid 500); 11 Sep 2017 06:48:30 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 68872 invoked by uid 99); 11 Sep 2017 06:48:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2017 06:48:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 861B5F5737; Mon, 11 Sep 2017 06:48:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asuresh@apache.org To: common-commits@hadoop.apache.org Date: Mon, 11 Sep 2017 06:49:10 -0000 Message-Id: In-Reply-To: <6d8213f631914bd1bfcbfc1704486aec@git.apache.org> References: <6d8213f631914bd1bfcbfc1704486aec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/50] [abbrv] hadoop git commit: HDFS-10391. Always enable NameNode service RPC port. Contributed by Gergely Novak. archived-at: Mon, 11 Sep 2017 06:48:44 -0000 http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa4b6fbe/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 b3bb3dd..4d04970 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 @@ -171,15 +171,18 @@ public class TestEditLogTailer { 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); + int[] ports = ServerSocketUtil.getPorts(6); MiniDFSNNTopology topology = new MiniDFSNNTopology() .addNameservice(new MiniDFSNNTopology.NSConf("ns1") .addNN(new MiniDFSNNTopology.NNConf("nn1") - .setIpcPort(ports[0])) + .setIpcPort(ports[0]) + .setServicePort(ports[1])) .addNN(new MiniDFSNNTopology.NNConf("nn2") - .setIpcPort(ports[1])) + .setIpcPort(ports[2]) + .setServicePort(ports[3])) .addNN(new MiniDFSNNTopology.NNConf("nn3") - .setIpcPort(ports[2]))); + .setIpcPort(ports[4]) + .setServicePort(ports[5]))); cluster = new MiniDFSCluster.Builder(conf) .nnTopology(topology) @@ -219,11 +222,14 @@ public class TestEditLogTailer { MiniDFSNNTopology topology = new MiniDFSNNTopology() .addNameservice(new MiniDFSNNTopology.NSConf("ns1") .addNN(new MiniDFSNNTopology.NNConf("nn1") - .setIpcPort(ServerSocketUtil.getPort(0, 100))) + .setIpcPort(ServerSocketUtil.getPort(0, 100)) + .setServicePort(ServerSocketUtil.getPort(0, 100))) .addNN(new MiniDFSNNTopology.NNConf("nn2") - .setIpcPort(ServerSocketUtil.getPort(0, 100))) + .setIpcPort(ServerSocketUtil.getPort(0, 100)) + .setServicePort(ServerSocketUtil.getPort(0, 100))) .addNN(new MiniDFSNNTopology.NNConf("nn3") - .setIpcPort(ServerSocketUtil.getPort(0, 100)))); + .setIpcPort(ServerSocketUtil.getPort(0, 100)) + .setServicePort(ServerSocketUtil.getPort(0, 100)))); MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf) .nnTopology(topology) http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa4b6fbe/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdmin.java index f1f5793..f2274f9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdmin.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hdfs.tools; +import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -179,9 +180,11 @@ public class TestDFSHAAdmin { Mockito.doReturn(STANDBY_READY_RESULT).when(mockProtocol) .getServiceStatus(); assertEquals(0, runTool("-getAllServiceState")); - assertOutputContains(String.format("%-50s %-10s", (HOST_A + ":" + 12345), + assertOutputContains(String.format("%-50s %-10s", (HOST_A + ":" + + DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT), STANDBY_READY_RESULT.getState())); - assertOutputContains(String.format("%-50s %-10s", (HOST_B + ":" + 12345), + assertOutputContains(String.format("%-50s %-10s", (HOST_B + ":" + + DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT), STANDBY_READY_RESULT.getState())); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa4b6fbe/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java index a21a31d..d49a3cf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java @@ -77,7 +77,7 @@ public class TestDFSHAAdminMiniCluster { tool.setErrOut(new PrintStream(errOutBytes)); cluster.waitActive(); - nn1Port = cluster.getNameNodePort(0); + nn1Port = cluster.getNameNodeServicePort(0); } @After http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa4b6fbe/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSZKFailoverController.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSZKFailoverController.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSZKFailoverController.java index bbb787e..9943260 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSZKFailoverController.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSZKFailoverController.java @@ -88,9 +88,11 @@ public class TestDFSZKFailoverController extends ClientBaseWithFixes { MiniDFSNNTopology topology = new MiniDFSNNTopology() .addNameservice(new MiniDFSNNTopology.NSConf("ns1") .addNN(new MiniDFSNNTopology.NNConf("nn1") - .setIpcPort(ServerSocketUtil.getPort(10021, 100))) + .setIpcPort(ServerSocketUtil.getPort(10021, 100)) + .setServicePort(ServerSocketUtil.getPort(10025, 100))) .addNN(new MiniDFSNNTopology.NNConf("nn2") - .setIpcPort(ServerSocketUtil.getPort(10022, 100)))); + .setIpcPort(ServerSocketUtil.getPort(10022, 100)) + .setServicePort(ServerSocketUtil.getPort(10026, 100)))); cluster = new MiniDFSCluster.Builder(conf) .nnTopology(topology) .numDataNodes(0) http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa4b6fbe/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java index 942719e..36d57a9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java @@ -24,6 +24,7 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_RPC_ADDRESS_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_SERVICE_RPC_ADDRESS_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMESERVICES; +import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -121,13 +122,13 @@ public class TestGetConf { TestType type, HdfsConfiguration conf) throws IOException { switch (type) { case NAMENODE: - return DFSUtil.getNNServiceRpcAddressesForCluster(conf); + return DFSUtil.getNNServiceRpcAddresses(conf); case BACKUP: return DFSUtil.getBackupNodeAddresses(conf); case SECONDARY: return DFSUtil.getSecondaryNameNodeAddresses(conf); case NNRPCADDRESSES: - return DFSUtil.getNNServiceRpcAddressesForCluster(conf); + return DFSUtil.getNNServiceRpcAddresses(conf); } return null; } @@ -278,10 +279,12 @@ public class TestGetConf { public void testNonFederation() throws Exception { HdfsConfiguration conf = new HdfsConfiguration(false); - // Returned namenode address should match default address + // Returned namenode address should match the default service address conf.set(FS_DEFAULT_NAME_KEY, "hdfs://localhost:1000"); - verifyAddresses(conf, TestType.NAMENODE, false, "localhost:1000"); - verifyAddresses(conf, TestType.NNRPCADDRESSES, true, "localhost:1000"); + verifyAddresses(conf, TestType.NAMENODE, false, "localhost:" + + DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT); + verifyAddresses(conf, TestType.NNRPCADDRESSES, true, "localhost:" + + DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT); // Returned address should match backupnode RPC address conf.set(DFS_NAMENODE_BACKUP_ADDRESS_KEY,"localhost:1001"); @@ -297,12 +300,14 @@ public class TestGetConf { conf.set(DFS_NAMENODE_RPC_ADDRESS_KEY, "localhost:1001"); verifyAddresses(conf, TestType.NAMENODE, false, "localhost:1000"); verifyAddresses(conf, TestType.NNRPCADDRESSES, true, "localhost:1000"); - - // Returned address should match RPC address + + // Returned namenode address should match the default service address conf = new HdfsConfiguration(); conf.set(DFS_NAMENODE_RPC_ADDRESS_KEY, "localhost:1001"); - verifyAddresses(conf, TestType.NAMENODE, false, "localhost:1001"); - verifyAddresses(conf, TestType.NNRPCADDRESSES, true, "localhost:1001"); + verifyAddresses(conf, TestType.NAMENODE, false, "localhost:" + + DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT); + verifyAddresses(conf, TestType.NNRPCADDRESSES, true, "localhost:" + + DFS_NAMENODE_SERVICE_RPC_PORT_DEFAULT); } /** @@ -330,23 +335,6 @@ public class TestGetConf { verifyAddresses(conf, TestType.BACKUP, false, backupAddresses); verifyAddresses(conf, TestType.SECONDARY, false, secondaryAddresses); verifyAddresses(conf, TestType.NNRPCADDRESSES, true, nnAddresses); - - // Test to ensure namenode, backup, secondary namenode addresses and - // namenode rpc addresses are returned from federation configuration. - // Returned namenode addresses are based on regular RPC address - // in the absence of service RPC address. - conf = new HdfsConfiguration(false); - setupNameServices(conf, nsCount); - nnAddresses = setupAddress(conf, - DFS_NAMENODE_RPC_ADDRESS_KEY, nsCount, 1000); - backupAddresses = setupAddress(conf, - DFS_NAMENODE_BACKUP_ADDRESS_KEY, nsCount, 2000); - secondaryAddresses = setupAddress(conf, - DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_KEY, nsCount, 3000); - verifyAddresses(conf, TestType.NAMENODE, false, nnAddresses); - verifyAddresses(conf, TestType.BACKUP, false, backupAddresses); - verifyAddresses(conf, TestType.SECONDARY, false, secondaryAddresses); - verifyAddresses(conf, TestType.NNRPCADDRESSES, true, nnAddresses); } @Test(timeout=10000) --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org