Repository: ambari Updated Branches: refs/heads/branch-2.4 1e898cfc3 -> 0200182f5
AMBARI-16642. After enabling HTTPS for YARN, NodeManager JVM Metrics on YARN Heatmaps show NA. (Qin Liu via jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0200182f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0200182f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0200182f Branch: refs/heads/branch-2.4 Commit: 0200182f5d522b3cb214a3f7e6e80f055487da40 Parents: 1e898cf Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Mon May 23 08:54:10 2016 -0700 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Tue Jun 7 11:11:32 2016 -0400 ---------------------------------------------------------------------- .../controller/internal/AbstractProviderModule.java | 4 ++++ .../server/controller/internal/JMXHostProviderTest.java | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0200182f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java index 3028b41..f41fc93 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java @@ -155,6 +155,7 @@ public abstract class AbstractProviderModule implements ProviderModule, initPropMap.put("RESOURCEMANAGER", new String[]{"yarn.resourcemanager.webapp.address"}); initPropMap.put("RESOURCEMANAGER-HTTPS", new String[]{"yarn.resourcemanager.webapp.https.address"}); initPropMap.put("NODEMANAGER", new String[]{"yarn.nodemanager.webapp.address"}); + initPropMap.put("NODEMANAGER-HTTPS", new String[]{"yarn.nodemanager.webapp.https.address"}); serviceDesiredProperties.put(Service.Type.YARN, initPropMap); initPropMap = new HashMap<String, String[]>(); @@ -179,6 +180,9 @@ public abstract class AbstractProviderModule implements ProviderModule, jmxDesiredProperties.put("RESOURCEMANAGER", initPropMap); initPropMap = new HashMap<String, String[]>(); + initPropMap.put("NODEMANAGER", new String[]{"yarn.http.policy"}); + jmxDesiredProperties.put("NODEMANAGER", initPropMap); + initPropMap = new HashMap<String, String[]>(); initPropMap.put("HISTORYSERVER", new String[]{"mapreduce.jobhistory.http.policy"}); jmxDesiredProperties.put("HISTORYSERVER", initPropMap); http://git-wip-us.apache.org/repos/asf/ambari/blob/0200182f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java index 7dbd60e..9f610f9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java @@ -76,6 +76,7 @@ public class JMXHostProviderTest { private static final String RESOURCEMANAGER_HTTPS_PORT = "yarn.resourcemanager.webapp.https.address"; private static final String YARN_HTTPS_POLICY = "yarn.http.policy"; private static final String NODEMANAGER_PORT = "yarn.nodemanager.webapp.address"; + private static final String NODEMANAGER_HTTPS_PORT = "yarn.nodemanager.webapp.https.address"; private static final String JOURNALNODE_HTTPS_PORT = "dfs.journalnode.https-address"; private static final String HDFS_HTTPS_POLICY = "dfs.http.policy"; private static final String MAPREDUCE_HTTPS_POLICY = "mapreduce.jobhistory.http.policy"; @@ -238,6 +239,7 @@ public class JMXHostProviderTest { String componentName4 = "RESOURCEMANAGER"; String componentName5 = "JOURNALNODE"; String componentName6 = "HISTORYSERVER"; + String componentName7 = "NODEMANAGER"; createServiceComponent(clusterName, serviceName, componentName1, State.INIT); @@ -251,6 +253,8 @@ public class JMXHostProviderTest { State.INIT); createServiceComponent(clusterName, serviceName3, componentName6, State.INIT); + createServiceComponent(clusterName, serviceName2, componentName7, + State.INIT); String host1 = "h1"; clusters.addHost(host1); @@ -287,6 +291,8 @@ public class JMXHostProviderTest { host2, null); createServiceComponentHost(clusterName, serviceName3, componentName6, host2, null); + createServiceComponentHost(clusterName, serviceName2, componentName7, + host2, null); // Create configs Map<String, String> configs = new HashMap<String, String>(); @@ -301,6 +307,7 @@ public class JMXHostProviderTest { yarnConfigs.put(RESOURCEMANAGER_PORT, "8088"); yarnConfigs.put(NODEMANAGER_PORT, "8042"); yarnConfigs.put(RESOURCEMANAGER_HTTPS_PORT, "8090"); + yarnConfigs.put(NODEMANAGER_HTTPS_PORT, "8044"); yarnConfigs.put(YARN_HTTPS_POLICY, "HTTPS_ONLY"); Map<String, String> mapreduceConfigs = new HashMap<String, String>(); @@ -518,7 +525,8 @@ public class JMXHostProviderTest { providerModule.registerResourceProvider(Resource.Type.Configuration); Assert.assertEquals("https", providerModule.getJMXProtocol("c1", "RESOURCEMANAGER")); Assert.assertEquals("8090", providerModule.getPort("c1", "RESOURCEMANAGER", "localhost", true)); - + Assert.assertEquals("https", providerModule.getJMXProtocol("c1", "NODEMANAGER")); + Assert.assertEquals("8044", providerModule.getPort("c1", "NODEMANAGER", "localhost", true)); } @Test