ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-18290. Ambari does not support HBase on HTTPS mode. (amarnathreddy via swagle)
Date Thu, 08 Sep 2016 17:20:32 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8efbde8fd -> f0e022d27


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/f0e022d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0e022d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0e022d2

Branch: refs/heads/trunk
Commit: f0e022d27d09fdcb5b7e513a42f08b3617bd6a53
Parents: 8efbde8
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Thu Sep 8 10:20:23 2016 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Thu Sep 8 10:20:23 2016 -0700

----------------------------------------------------------------------
 .../controller/internal/AbstractProviderModule.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f0e022d2/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 75d8449..b6cbed5 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);
 
@@ -1199,7 +1209,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);


Mime
View raw message