From commits-return-975-apmail-apex-commits-archive=apex.apache.org@apex.incubator.apache.org Sun Oct 11 16:05:29 2015 Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 51C5318CD8 for ; Sun, 11 Oct 2015 16:05:29 +0000 (UTC) Received: (qmail 95815 invoked by uid 500); 11 Oct 2015 16:05:29 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 95774 invoked by uid 500); 11 Oct 2015 16:05:29 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 95765 invoked by uid 99); 11 Oct 2015 16:05:29 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Oct 2015 16:05:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id C2799C0EC9 for ; Sun, 11 Oct 2015 16:05:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id gPTagofWyBYg for ; Sun, 11 Oct 2015 16:05:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 2DE3C439FA for ; Sun, 11 Oct 2015 16:05:18 +0000 (UTC) Received: (qmail 95202 invoked by uid 99); 11 Oct 2015 16:05:17 -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; Sun, 11 Oct 2015 16:05:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AA3C4E1087; Sun, 11 Oct 2015 16:05:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vrozov@apache.org To: commits@apex.incubator.apache.org Date: Sun, 11 Oct 2015 16:05:40 -0000 Message-Id: <46ae22cfdb3f4af1bb21ef9bcd42511c@git.apache.org> In-Reply-To: <05481e5f89f84da8afcd24528691195d@git.apache.org> References: <05481e5f89f84da8afcd24528691195d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/29] incubator-apex-core git commit: APEX-181 added utility function to get all RM addresses APEX-181 added utility function to get all RM addresses Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/3d0dd624 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/3d0dd624 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/3d0dd624 Branch: refs/heads/feature-module Commit: 3d0dd624a1b83b819fa64ab1f9fc3da6402db7fb Parents: c442568 Author: David Yan Authored: Wed Oct 7 18:31:36 2015 -0700 Committer: David Yan Committed: Thu Oct 8 10:35:18 2015 -0700 ---------------------------------------------------------------------- .../stram/client/StramClientUtils.java | 17 +++++++++++++++++ .../stram/client/StramClientUtilsTest.java | 19 ++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/3d0dd624/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java index 04a3484..4ac6487 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java +++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java @@ -777,4 +777,21 @@ public class StramClientUtils return host + ":" + socketAddress.getPort(); } + public static List getRMAddresses(Configuration conf) + { + + List rmAddresses = new ArrayList<>(); + if (ConfigUtils.isRMHAEnabled(conf)) { + // HA is enabled get all + for (String rmId : ConfigUtils.getRMHAIds(conf)) { + InetSocketAddress socketAddress = getRMWebAddress(conf, rmId); + rmAddresses.add(socketAddress); + } + } else { + InetSocketAddress socketAddress = getRMWebAddress(conf, null); + rmAddresses.add(socketAddress); + } + return rmAddresses; + } + } http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/3d0dd624/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java ---------------------------------------------------------------------- diff --git a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java index e97b49f..f9fca05 100644 --- a/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java +++ b/engine/src/test/java/com/datatorrent/stram/client/StramClientUtilsTest.java @@ -19,7 +19,9 @@ package com.datatorrent.stram.client; import java.net.InetAddress; +import java.net.InetSocketAddress; import java.net.UnknownHostException; +import java.util.List; import org.junit.Assert; import org.junit.Test; @@ -57,9 +59,16 @@ public class StramClientUtilsTest conf.set(YarnConfiguration.RM_WEBAPP_ADDRESS, "192.168.1.1:8032"); conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "192.168.1.2:8032"); Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null))); + List addresses = StramClientUtils.getRMAddresses(conf); + Assert.assertEquals(1, addresses.size()); + Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(0))); + conf.setBoolean(CommonConfigurationKeysPublic.HADOOP_SSL_ENABLED_KEY, true); Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null))); - + addresses = StramClientUtils.getRMAddresses(conf); + Assert.assertEquals(1, addresses.size()); + Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(0))); + // set localhost if host is unknown conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "someunknownhost.:8032"); @@ -70,12 +79,16 @@ public class StramClientUtilsTest Assert.assertEquals(InetAddress.getLocalHost().getCanonicalHostName() + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, null))); // test when HA is enabled - conf.getBoolean(ConfigUtils.RM_HA_ENABLED, true); + conf.setBoolean(ConfigUtils.RM_HA_ENABLED, true); conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + ".rm1", "192.168.1.1:8032"); conf.set(YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS + ".rm2", "192.168.1.2:8032"); + conf.set("yarn.resourcemanager.ha.rm-ids", "rm1,rm2"); Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, "rm1"))); Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(StramClientUtils.getRMWebAddress(conf, "rm2"))); - + addresses = StramClientUtils.getRMAddresses(conf); + Assert.assertEquals(2, addresses.size()); + Assert.assertEquals(getHostString("192.168.1.1") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(0))); + Assert.assertEquals(getHostString("192.168.1.2") + ":8032", StramClientUtils.getSocketConnectString(addresses.get(1))); } }