ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-20469. Add a new property to yarn-site.xml yarn.log.server.web-service.url (Madhuvanthi Radhakrishnan via smohanty)
Date Thu, 16 Mar 2017 21:41:55 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c85e8ed6d -> 5a17da983


AMBARI-20469. Add a new property to yarn-site.xml yarn.log.server.web-service.url (Madhuvanthi
Radhakrishnan via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 5a17da983a6cf04c0f319abc7d36743561a952e3
Parents: c85e8ed
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Thu Mar 16 14:36:21 2017 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Thu Mar 16 14:40:58 2017 -0700

----------------------------------------------------------------------
 ambari-server/set-hdp-repo-url.sh                                | 2 +-
 .../stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml     | 4 ++--
 .../controller/internal/BlueprintConfigurationProcessorTest.java | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5a17da98/ambari-server/set-hdp-repo-url.sh
----------------------------------------------------------------------
diff --git a/ambari-server/set-hdp-repo-url.sh b/ambari-server/set-hdp-repo-url.sh
index 6d46db0..1835705 100644
--- a/ambari-server/set-hdp-repo-url.sh
+++ b/ambari-server/set-hdp-repo-url.sh
@@ -57,7 +57,7 @@ then
 
    
   # all stacks get the same url
-  for ver in '1.3' '2.0' '2.1' '2.2' '2.3' '2.4' '2.5'; do
+  for ver in '1.3' '2.0' '2.1' '2.2' '2.3' '2.4' '2.5' '2.6'; do
     HDPREPO=target/classes/stacks/HDP/$ver/repos
     if [ -d $HDPREPO ]; then
       echo "Replacing $ver latest lookup url to '$LATEST_URL'"

http://git-wip-us.apache.org/repos/asf/ambari/blob/5a17da98/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
index 13017d7..acdae65 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml
@@ -80,11 +80,11 @@
       </property>
       <property>
         <type>yarn-site</type>
-        <name>yarn.resourcemanager.webapp.address</name>
+        <name>yarn.timeline-service.webapp.address</name>
       </property>
       <property>
         <type>yarn-site</type>
-        <name>yarn.resourcemanager.webapp.https.address</name>
+        <name>yarn.timeline-service.webapp.https.address</name>
       </property>
     </depends-on>
     <on-ambari-upgrade add="false"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/5a17da98/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index 2840a31..5eed8dc 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -1265,6 +1265,7 @@ public class BlueprintConfigurationProcessorTest {
     yarnSiteProperties.put("yarn.timeline-service.address", expectedHostName + ":" + expectedPortNum);
     yarnSiteProperties.put("yarn.timeline-service.webapp.address", expectedHostName + ":"
+ expectedPortNum);
     yarnSiteProperties.put("yarn.timeline-service.webapp.https.address", expectedHostName
+ ":" + expectedPortNum);
+    yarnSiteProperties.put("yarn.log.server.web-service.url", expectedHostName + ":" + expectedPortNum);
 
     Configuration clusterConfig = new Configuration(configProperties,
         Collections.<String, Map<String, Map<String, String>>>emptyMap());
@@ -1306,6 +1307,8 @@ public class BlueprintConfigurationProcessorTest {
         createExportedAddress(expectedPortNum, expectedHostGroupName), yarnSiteProperties.get("yarn.timeline-service.webapp.address"));
     assertEquals("Yarn ResourceManager timeline webapp HTTPS address was incorrectly exported",
         createExportedAddress(expectedPortNum, expectedHostGroupName), yarnSiteProperties.get("yarn.timeline-service.webapp.https.address"));
+    assertEquals("Yarn ResourceManager timeline web service url was incorrectly exported",
+            createExportedAddress(expectedPortNum, expectedHostGroupName), yarnSiteProperties.get("yarn.log.server.web-service.url"));
   }
 
   @Test


Mime
View raw message