You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2016/10/28 16:14:31 UTC
ambari git commit: AMBARI-18290. Ambari does not support HBase on
HTTPS mode. (amarnathreddy via swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 cc2fb2896 -> b0a80fdd9
AMBARI-18290. Ambari does not support HBase on HTTPS mode. (amarnathreddy via swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0a80fdd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0a80fdd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0a80fdd
Branch: refs/heads/branch-2.4
Commit: b0a80fdd9df1095273e920d058e184baf87fe57a
Parents: cc2fb28
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Sep 8 10:20:23 2016 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Fri Oct 28 09:13:25 2016 -0700
----------------------------------------------------------------------
.../controller/internal/AbstractProviderModule.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0a80fdd/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 066d5c4..8beebee 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
@@ -150,6 +150,8 @@ public abstract class AbstractProviderModule implements ProviderModule,
initPropMap = new HashMap<String, String[]>();
initPropMap.put("HBASE_MASTER", new String[]{"hbase.master.info.port"});
initPropMap.put("HBASE_REGIONSERVER", new String[]{"hbase.regionserver.info.port"});
+ initPropMap.put("HBASE_MASTER-HTTPS", new String[]{"hbase.master.info.port"});
+ initPropMap.put("HBASE_REGIONSERVER-HTTPS", new String[]{"hbase.regionserver.info.port"});
serviceDesiredProperties.put(Service.Type.HBASE, initPropMap);
initPropMap = new HashMap<String, String[]>();
@@ -181,6 +183,14 @@ public abstract class AbstractProviderModule implements ProviderModule,
jmxDesiredProperties.put("RESOURCEMANAGER", initPropMap);
initPropMap = new HashMap<String, String[]>();
+ initPropMap.put("HBASE_MASTER", new String[]{"hbase.http.policy"});
+ jmxDesiredProperties.put("HBASE_MASTER", initPropMap);
+
+ initPropMap = new HashMap<String, String[]>();
+ initPropMap.put("HBASE_REGIONSERVER", new String[]{"hbase.http.policy"});
+ jmxDesiredProperties.put("HBASE_REGIONSERVER", initPropMap);
+
+ initPropMap = new HashMap<String, String[]>();
initPropMap.put("NODEMANAGER", new String[]{"yarn.http.policy"});
jmxDesiredProperties.put("NODEMANAGER", initPropMap);
initPropMap = new HashMap<String, String[]>();
@@ -1198,7 +1208,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
}
try {
- if (componentName.equals("NAMENODE") || componentName.equals("DATANODE") || componentName.equals("RESOURCEMANAGER") || componentName.equals("NODEMANAGER") || componentName.equals("JOURNALNODE") || componentName.equals("HISTORYSERVER")) {
+ if (componentName.equals("NAMENODE") || componentName.equals("DATANODE") || componentName.equals("RESOURCEMANAGER") || componentName.equals("NODEMANAGER") || componentName.equals("JOURNALNODE") || componentName.equals("HISTORYSERVER") || componentName.equals("HBASE_MASTER") || componentName.equals("HBASE_REGIONSERVER")) {
Service.Type service = componentServiceMap.get(componentName);
String config = serviceConfigTypes.get(service);
String newSiteConfigVersion = getDesiredConfigVersion(clusterName, config);