Repository: ambari Updated Branches: refs/heads/branch-1.7.0 25b5adc0e -> e19a40194 refs/heads/trunk ab532a54b -> 3d7fa6a44
AMBARI-7715. HDP 2.2 Stack Advisor ignores dfs.http.policy value (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d7fa6a4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d7fa6a4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d7fa6a4 Branch: refs/heads/trunk Commit: 3d7fa6a44c26ead72c5ee08ab6b7374d03a34fff Parents: ab532a5 Author: Lisnichenko Dmitro <[email protected]> Authored: Fri Oct 10 11:11:19 2014 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Fri Oct 10 11:11:19 2014 +0300 ---------------------------------------------------------------------- .../0.8/services/HDFS/configuration/hdfs-site.xml | 8 ++++++++ .../services/HDFS/configuration/hdfs-site.xml | 8 ++++++++ .../services/HDFS/configuration/core-site.xml | 10 ---------- .../services/HDFS/configuration/hdfs-site.xml | 18 ++++++++++++++++++ .../services/HDFS/configuration/core-site.xml | 10 ---------- .../services/HDFS/configuration/hdfs-site.xml | 18 ++++++++++++++++++ .../stacks/2.1/configs/default-storm-start.json | 6 +++--- .../stacks/2.1/configs/secured-storm-start.json | 6 +++--- .../app/views/common/quick_view_link_view.js | 7 ++++--- .../resources/ui/app/assets/data/apps/apps.json | 6 +++--- 10 files changed, 65 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml index 8fe9603..dfe71db 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hdfs-site.xml @@ -198,6 +198,14 @@ </property> <property> + <name>dfs.datanode.https.address</name> + <value>0.0.0.0:50475</value> + <description> + The datanode https server address and port. + </description> + </property> + + <property> <name>dfs.blocksize</name> <value>134217728</value> <description>The default block size for new files.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml index 5082aa5..b07d475 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml @@ -160,6 +160,14 @@ </property> <property> + <name>dfs.datanode.https.address</name> + <value>0.0.0.0:50475</value> + <description> + The datanode https server address and port. + </description> + </property> + + <property> <name>dfs.block.size</name> <value>134217728</value> <description>The default block size for new files.</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml index e79b146..2856504 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/core-site.xml @@ -163,14 +163,4 @@ RULE[2:$1%$2@$0](.%[email protected])s/./admin/ DEFAULT </description> </property> - - <property> - <name>dfs.http.policy</name> - <value>HTTP_ONLY</value> - <description> - Decide if HTTPS(SSL) is supported on HDFS This configures the HTTP endpoint for HDFS daemons: - The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : - Service is provided only on https - HTTP_AND_HTTPS : Service is provided both on http and https - </description> - </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml index f72feee..b4072ae 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HDFS/configuration/hdfs-site.xml @@ -197,6 +197,14 @@ </property> <property> + <name>dfs.datanode.https.address</name> + <value>0.0.0.0:50475</value> + <description> + The datanode https server address and port. + </description> + </property> + + <property> <name>dfs.blocksize</name> <value>134217728</value> <description>The default block size for new files.</description> @@ -494,4 +502,14 @@ don't exist, they will be created with this permission.</description> When enabled, a recovery of any failed directory is attempted during checkpoint.</description> </property> + <property> + <name>dfs.http.policy</name> + <value>HTTP_ONLY</value> + <description> + Decide if HTTPS(SSL) is supported on HDFS This configures the HTTP endpoint for HDFS daemons: + The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : + Service is provided only on https - HTTP_AND_HTTPS : Service is provided both on http and https + </description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml index 31254b6..52764ac 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/core-site.xml @@ -177,14 +177,4 @@ DEFAULT </description> </property> - <property> - <name>dfs.http.policy</name> - <value>HTTP_ONLY</value> - <description> - Decide if HTTPS(SSL) is supported on HDFS This configures the HTTP endpoint for HDFS daemons: - The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : - Service is provided only on https - HTTP_AND_HTTPS : Service is provided both on http and https - </description> - </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml index 8fe9603..eb5ebdc 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml @@ -198,6 +198,14 @@ </property> <property> + <name>dfs.datanode.https.address</name> + <value>0.0.0.0:50475</value> + <description> + The datanode https server address and port. + </description> + </property> + + <property> <name>dfs.blocksize</name> <value>134217728</value> <description>The default block size for new files.</description> @@ -493,4 +501,14 @@ When enabled, a recovery of any failed directory is attempted during checkpoint.</description> </property> + <property> + <name>dfs.http.policy</name> + <value>HTTP_ONLY</value> + <description> + Decide if HTTPS(SSL) is supported on HDFS This configures the HTTP endpoint for HDFS daemons: + The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : + Service is provided only on https - HTTP_AND_HTTPS : Service is provided both on http and https + </description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json index f90f7e2..a67ea6a 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json @@ -204,7 +204,8 @@ "dfs.datanode.data.dir.perm": "750", "dfs.namenode.name.dir.restore": "true", "dfs.replication.max": "50", - "dfs.namenode.checkpoint.period": "21600" + "dfs.namenode.checkpoint.period": "21600", + "dfs.http.policy": "HTTP_ONLY" }, "storm-env": { "content": "\n#!/bin/bash\n\n# Set Storm specific environment variables here.\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}\n\n# export STORM_CONF_DIR=\"\"", @@ -215,7 +216,6 @@ "core-site": { "io.serializations": "org.apache.hadoop.io.serializer.WritableSerialization", "fs.trash.interval": "360", - "dfs.http.policy": "HTTP_ONLY", "hadoop.security.authentication": "simple", "io.compression.codecs": "org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec", "hadoop.proxyuser.falcon.hosts": "*", @@ -353,4 +353,4 @@ "c6402.ambari.apache.org" ] } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json index 005a4df..73871c9 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json @@ -209,7 +209,8 @@ "dfs.datanode.data.dir.perm": "750", "dfs.namenode.name.dir.restore": "true", "dfs.replication.max": "50", - "dfs.namenode.checkpoint.period": "21600" + "dfs.namenode.checkpoint.period": "21600", + "dfs.http.policy": "HTTP_ONLY" }, "storm-env": { "storm_log_dir": "/var/log/storm", @@ -226,7 +227,6 @@ "core-site": { "io.serializations": "org.apache.hadoop.io.serializer.WritableSerialization", "fs.trash.interval": "360", - "dfs.http.policy": "HTTP_ONLY", "hadoop.security.authentication": "kerberos", "io.compression.codecs": "org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec", "hadoop.proxyuser.falcon.hosts": "*", @@ -370,4 +370,4 @@ "c6402.ambari.apache.org" ] } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/ambari-web/app/views/common/quick_view_link_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js index f941100..ce859e6 100644 --- a/ambari-web/app/views/common/quick_view_link_view.js +++ b/ambari-web/app/views/common/quick_view_link_view.js @@ -308,11 +308,12 @@ App.QuickViewLinks = Em.View.extend({ setProtocol: function (service_id, configProperties, ambariProperties) { var hadoopSslEnabled = false; if (configProperties && configProperties.length > 0) { - var site = configProperties.findProperty('type', 'core-site'); + var coreSite = configProperties.findProperty('type', 'core-site'); + var hdfsSite = configProperties.findProperty('type', 'hdfs-site'); if (App.get('isHadoop2Stack')) { - hadoopSslEnabled = (Em.get(site, 'properties') && site.properties['dfs.http.policy'] === 'HTTPS_ONLY'); + hadoopSslEnabled = (Em.get(hdfsSite, 'properties') && hdfsSite.properties['dfs.http.policy'] === 'HTTPS_ONLY'); } else { - hadoopSslEnabled = (Em.get(site, 'properties') && site.properties['hadoop.ssl.enabled'] == true); + hadoopSslEnabled = (Em.get(coreSite, 'properties') && coreSite.properties['hadoop.ssl.enabled'] == true); } } switch (service_id) { http://git-wip-us.apache.org/repos/asf/ambari/blob/3d7fa6a4/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json index ee31d42..23423d8 100644 --- a/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json +++ b/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json @@ -1108,7 +1108,6 @@ "container_1411422858327_0005_01_000006.app.monitor" : "mop-3.c.pramod-thangali.internal:43240/master-status" }, "core-site" : { - "dfs.http.policy" : "HTTP_ONLY", "fs.defaultFS" : "hdfs://mop-5.c.pramod-thangali.internal:8020", "fs.trash.interval" : "360", "hadoop.proxyuser.falcon.groups" : "users", @@ -1224,7 +1223,8 @@ "dfs.web.authentication.kerberos.keytab" : "/etc/security/keytabs/spnego.service.keytab", "dfs.web.authentication.kerberos.principal" : "HTTP/[email protected]", "dfs.webhdfs.enabled" : "true", - "fs.permissions.umask-mode" : "022" + "fs.permissions.umask-mode" : "022", + "dfs.http.policy" : "HTTP_ONLY" }, "logfolders" : { "HBASE_MASTER->mop-3.c.pramod-thangali.internal->AGENT_LOG_ROOT->container_1411422858327_0005_01_000006" : "/hadoop/yarn/log/application_1411422858327_0005/container_1411422858327_0005_01_000006", @@ -1317,4 +1317,4 @@ } } ] -} \ No newline at end of file +}
