Ver código fonte

AMBARI-18290. Ambari does not support HBase on HTTPS mode. (amarnathreddy via swagle)

Siddharth Wagle 9 anos atrás
pai
commit
26a44a71a5

+ 11 - 1
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[]>();
@@ -180,6 +182,14 @@ public abstract class AbstractProviderModule implements ProviderModule,
     initPropMap.put("RESOURCEMANAGER", new String[]{"yarn.http.policy"});
     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);
@@ -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);