ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gna...@apache.org
Subject ambari git commit: AMBARI-17849. Local and custom views are not working when swebhdfs and Namenode HA is enabled.(gauravn7)
Date Fri, 22 Jul 2016 07:55:39 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 dc22b6efe -> b88e6e231


AMBARI-17849. Local and custom views are not working when swebhdfs and Namenode HA is enabled.(gauravn7)


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

Branch: refs/heads/branch-2.4
Commit: b88e6e2314f87067ba8e0f3eac20092d4e82a60a
Parents: dc22b6e
Author: Gaurav Nagar <gnagar@hortonworks.com>
Authored: Fri Jul 22 13:21:24 2016 +0530
Committer: Gaurav Nagar <gnagar@hortonworks.com>
Committed: Fri Jul 22 13:24:22 2016 +0530

----------------------------------------------------------------------
 contrib/views/files/src/main/resources/view.xml     | 16 ++++++++++++++++
 contrib/views/hive-next/src/main/resources/view.xml | 16 ++++++++++++++++
 contrib/views/hive/src/main/resources/view.xml      | 16 ++++++++++++++++
 contrib/views/pig/src/main/resources/view.xml       | 16 ++++++++++++++++
 .../view/utils/hdfs/ConfigurationBuilder.java       | 12 ++++++++++--
 5 files changed, 74 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b88e6e23/contrib/views/files/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/src/main/resources/view.xml b/contrib/views/files/src/main/resources/view.xml
index ad5202c..d6b2fde 100644
--- a/contrib/views/files/src/main/resources/view.xml
+++ b/contrib/views/files/src/main/resources/view.xml
@@ -80,6 +80,22 @@
         <cluster-config>fake</cluster-config>
     </parameter>
     <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn1</name>
+        <description>WebHDFS Https address for first name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode1] property</description>
+        <label>First NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn2</name>
+        <description>WebHDFS Https address for second name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode2] property</description>
+        <label>Second NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
         <name>webhdfs.client.failover.proxy.provider</name>
         <description>The Java class that HDFS clients use to contact the Active NameNode
             Value of hdfs-site/dfs.client.failover.proxy.provider.[nameservice] property</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b88e6e23/contrib/views/hive-next/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hive-next/src/main/resources/view.xml b/contrib/views/hive-next/src/main/resources/view.xml
index 326062c..52fe3ec 100644
--- a/contrib/views/hive-next/src/main/resources/view.xml
+++ b/contrib/views/hive-next/src/main/resources/view.xml
@@ -112,6 +112,22 @@
         <cluster-config>fake</cluster-config>
     </parameter>
     <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn1</name>
+        <description>WebHDFS Https address for first name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode1] property</description>
+        <label>First NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn2</name>
+        <description>WebHDFS Https address for second name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode2] property</description>
+        <label>Second NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
         <name>webhdfs.client.failover.proxy.provider</name>
         <description>The Java class that HDFS clients use to contact the Active NameNode
           Value of hdfs-site/dfs.client.failover.proxy.provider.[nameservice] property</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b88e6e23/contrib/views/hive/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/view.xml b/contrib/views/hive/src/main/resources/view.xml
index 58acee6..36b43d5 100644
--- a/contrib/views/hive/src/main/resources/view.xml
+++ b/contrib/views/hive/src/main/resources/view.xml
@@ -151,6 +151,22 @@
         <cluster-config>fake</cluster-config>
     </parameter>
     <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn1</name>
+        <description>WebHDFS Https address for first name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode1] property</description>
+        <label>First NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn2</name>
+        <description>WebHDFS Https address for second name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode2] property</description>
+        <label>Second NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
         <name>webhdfs.client.failover.proxy.provider</name>
         <description>The Java class that HDFS clients use to contact the Active NameNode
           Value of hdfs-site/dfs.client.failover.proxy.provider.[nameservice] property</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b88e6e23/contrib/views/pig/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/src/main/resources/view.xml b/contrib/views/pig/src/main/resources/view.xml
index de338da..da8ffdd 100644
--- a/contrib/views/pig/src/main/resources/view.xml
+++ b/contrib/views/pig/src/main/resources/view.xml
@@ -83,6 +83,22 @@
         <cluster-config>fake</cluster-config>
     </parameter>
     <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn1</name>
+        <description>WebHDFS Https address for first name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode1] property</description>
+        <label>First NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
+        <name>webhdfs.ha.namenode.https-address.nn2</name>
+        <description>WebHDFS Https address for second name node.
+            Value of hdfs-site/dfs.namenode.https-address.[nameservice].[namenode2] property</description>
+        <label>Second NameNode HTTPS (WebHDFS) Address</label>
+        <required>false</required>
+        <cluster-config>fake</cluster-config>
+    </parameter>
+    <parameter>
         <name>webhdfs.client.failover.proxy.provider</name>
         <description>The Java class that HDFS clients use to contact the Active NameNode
             Value of hdfs-site/dfs.client.failover.proxy.provider.[nameservice] property</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b88e6e23/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
index 5d0c1d3..1c17e6a 100644
--- a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
+++ b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
@@ -55,12 +55,16 @@ public class ConfigurationBuilder {
   public static final String HA_NAMENODES_CLUSTER_PROPERTY  = "dfs.ha.namenodes.%s";
   public static final String NAMENODE_RPC_NN1_INSTANCE_PROPERTY = "webhdfs.ha.namenode.rpc-address.nn1";
   public static final String NAMENODE_RPC_NN2_INSTANCE_PROPERTY = "webhdfs.ha.namenode.rpc-address.nn2";
-
   public static final String NAMENODE_RPC_NN_CLUSTER_PROPERTY   = "dfs.namenode.rpc-address.%s.%s";
+
   public static final String NAMENODE_HTTP_NN1_INSTANCE_PROPERTY = "webhdfs.ha.namenode.http-address.nn1";
   public static final String NAMENODE_HTTP_NN2_INSTANCE_PROPERTY = "webhdfs.ha.namenode.http-address.nn2";
-
   public static final String NAMENODE_HTTP_NN_CLUSTER_PROPERTY   = "dfs.namenode.http-address.%s.%s";
+
+  public static final String NAMENODE_HTTPS_NN1_INSTANCE_PROPERTY = "webhdfs.ha.namenode.https-address.nn1";
+  public static final String NAMENODE_HTTPS_NN2_INSTANCE_PROPERTY = "webhdfs.ha.namenode.https-address.nn2";
+  public static final String NAMENODE_HTTPS_NN_CLUSTER_PROPERTY   = "dfs.namenode.https-address.%s.%s";
+
   public static final String FAILOVER_PROXY_PROVIDER_INSTANCE_PROPERTY = "webhdfs.client.failover.proxy.provider";
   public static final String FAILOVER_PROXY_PROVIDER_CLUSTER_PROPERTY  = "dfs.client.failover.proxy.provider.%s";
 
@@ -203,12 +207,16 @@ public class ConfigurationBuilder {
                         NAMENODE_RPC_NN1_INSTANCE_PROPERTY);
     copyClusterProperty(String.format(NAMENODE_HTTP_NN_CLUSTER_PROPERTY, nameservice, namenodes[0]),
                         NAMENODE_HTTP_NN1_INSTANCE_PROPERTY);
+    copyClusterProperty(String.format(NAMENODE_HTTPS_NN_CLUSTER_PROPERTY, nameservice, namenodes[0]),
+      NAMENODE_HTTPS_NN1_INSTANCE_PROPERTY);
 
     //NN2
     copyClusterProperty(String.format(NAMENODE_RPC_NN_CLUSTER_PROPERTY, nameservice, namenodes[1]),
                         NAMENODE_RPC_NN2_INSTANCE_PROPERTY);
     copyClusterProperty(String.format(NAMENODE_HTTP_NN_CLUSTER_PROPERTY, nameservice, namenodes[1]),
                         NAMENODE_HTTP_NN2_INSTANCE_PROPERTY);
+    copyClusterProperty(String.format(NAMENODE_HTTPS_NN_CLUSTER_PROPERTY, nameservice, namenodes[1]),
+      NAMENODE_HTTPS_NN2_INSTANCE_PROPERTY);
 
     copyClusterProperty(String.format(FAILOVER_PROXY_PROVIDER_CLUSTER_PROPERTY, nameservice),
                         FAILOVER_PROXY_PROVIDER_INSTANCE_PROPERTY);


Mime
View raw message