ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [2/2] ambari git commit: AMBARI-16965. Exception while detecting JMX protocol for HISTORYSERVER (aonishuk)
Date Thu, 02 Jun 2016 14:26:57 GMT
AMBARI-16965. Exception while detecting JMX protocol for HISTORYSERVER (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d39b872
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d39b872
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d39b872

Branch: refs/heads/branch-2.4
Commit: 3d39b872108b1b06e7fed0044459bd15086871a3
Parents: 4209a13
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Thu Jun 2 17:26:48 2016 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Jun 2 17:26:48 2016 +0300

----------------------------------------------------------------------
 .../controller/internal/AbstractProviderModule.java       |  3 +--
 .../YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml   | 10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d39b872/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 92b16aa..c5e497d 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
@@ -1203,8 +1203,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
       LOG.debug("Detected JMX protocol is null for clusterName = " + clusterName +
           ", componentName = " + componentName);
       LOG.debug("Defaulting JMX to HTTP protocol for  for clusterName = " + clusterName +
-          ", componentName = " + componentName +
-          componentName);
+          ", componentName = " + componentName);
       jmxProtocolString = "http";
     }
     if (LOG.isDebugEnabled()) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d39b872/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
index 3e78c37..3ab9cc8 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
@@ -464,4 +464,14 @@
     </description>
   </property>
 
+  <property>
+    <name>mapreduce.jobhistory.http.policy</name>
+    <value>HTTP_ONLY</value>
+    <description>
+      This configures the HTTP endpoint for JobHistoryServer web UI.
+      The following values are supported: - HTTP_ONLY : Service is provided only
+      on http - HTTPS_ONLY : Service is provided only on https
+    </description>
+  </property>
+
 </configuration>


Mime
View raw message