You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/01/26 03:17:04 UTC
[3/3] ambari git commit: AMBARI-19098. HDP 3.0 TP - create Service
Advisor for YARN/MR (alejandro)
AMBARI-19098. HDP 3.0 TP - create Service Advisor for YARN/MR (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/539a4149
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/539a4149
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/539a4149
Branch: refs/heads/trunk
Commit: 539a4149ae7cddfb4b30c2b1deed9fdd9517abaa
Parents: 5a02a2a
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Mon Jan 16 17:59:59 2017 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Jan 25 19:13:39 2017 -0800
----------------------------------------------------------------------
.../HDFS/3.0.0.3.0/service_advisor.py | 4 -
.../common-services/YARN/3.0.0.3.0/metainfo.xml | 73 +-
.../YARN/3.0.0.3.0/service_advisor.py | 1789 ++++++++++++++++++
.../stacks/HDP/2.0.6/services/stack_advisor.py | 343 +---
.../stacks/HDP/2.1/services/stack_advisor.py | 19 +-
.../stacks/HDP/2.2/services/stack_advisor.py | 1 -
.../stacks/HDP/2.3/services/stack_advisor.py | 18 +-
.../stacks/HDP/2.5/services/stack_advisor.py | 47 +-
.../stacks/HDP/3.0/role_command_order.json | 27 +-
.../stacks/HDP/3.0/services/YARN/metainfo.xml | 3 +-
.../src/main/resources/stacks/stack_advisor.py | 287 ++-
11 files changed, 2162 insertions(+), 449 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/539a4149/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/service_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/service_advisor.py b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/service_advisor.py
index eb7f35c..2291c94 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/service_advisor.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/service_advisor.py
@@ -22,13 +22,9 @@ import imp
import os
import traceback
import inspect
-import re
-import socket
-from urlparse import urlparse
# Local imports
from resource_management.core.logger import Logger
-from resource_management.libraries.functions.data_structure_utils import get_from_dict
from resource_management.libraries.functions.mounted_dirs_helper import get_mounts_with_multiple_data_dirs
http://git-wip-us.apache.org/repos/asf/ambari/blob/539a4149/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
index 48352e8..a094cba 100644
--- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
@@ -27,38 +27,40 @@
<components>
<component>
- <component>
- <name>APP_TIMELINE_SERVER</name>
- <displayName>App Timeline Server</displayName>
- <category>MASTER</category>
- <cardinality>1</cardinality>
- <versionAdvertised>true</versionAdvertised>
- <reassignAllowed>true</reassignAllowed>
+ <name>APP_TIMELINE_SERVER</name>
+ <displayName>App Timeline Server</displayName>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <versionAdvertised>true</versionAdvertised>
+ <reassignAllowed>true</reassignAllowed>
- <commandScript>
- <script>scripts/application_timeline_server.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>1200</timeout>
- </commandScript>
+ <commandScript>
+ <script>scripts/application_timeline_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>1200</timeout>
+ </commandScript>
- <dependencies>
- <dependency>
- <name>TEZ/TEZ_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- <dependency>
- <name>SPARK/SPARK_CLIENT</name>
- <scope>host</scope>
- <auto-deploy>
- <enabled>true</enabled>
- </auto-deploy>
- </dependency>
- </dependencies>
- </component>
+ <!-- TODO Alejandro add later after UI is fixed,
+ <dependencies>
+ <dependency>
+ <name>TEZ/TEZ_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>SPARK/SPARK_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ -->
+ </component>
+ <component>
<name>RESOURCEMANAGER</name>
<displayName>ResourceManager</displayName>
<category>MASTER</category>
@@ -70,6 +72,8 @@
<scriptType>PYTHON</scriptType>
<timeout>1200</timeout>
</commandScript>
+
+ <!-- TODO Alejandro add later after UI is fixed,
<dependencies>
<dependency>
<name>TEZ/TEZ_CLIENT</name>
@@ -79,6 +83,8 @@
</auto-deploy>
</dependency>
</dependencies>
+ -->
+
<logs>
<log>
<logId>yarn_resourcemanager</logId>
@@ -91,6 +97,7 @@
<logId>yarn_jobsummary</logId>
</log>
</logs>
+
<customCommands>
<customCommand>
<name>DECOMMISSION</name>
@@ -109,6 +116,7 @@
</commandScript>
</customCommand>
</customCommands>
+
<configuration-dependencies>
<config-type>capacity-scheduler</config-type>
<config-type>hdfs-site</config-type>
@@ -245,7 +253,7 @@
<name>MAPREDUCE2</name>
<displayName>MapReduce2</displayName>
<comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
- <version>2.1.0.2.0.6.0</version>
+ <version>3.0.0.3.0</version>
<components>
<component>
@@ -259,6 +267,8 @@
<enabled>true</enabled>
<co-locate>YARN/RESOURCEMANAGER</co-locate>
</auto-deploy>
+
+ <!-- TODO Alejandro add later after UI is fixed,
<dependencies>
<dependency>
<name>HDFS/HDFS_CLIENT</name>
@@ -282,6 +292,8 @@
</auto-deploy>
</dependency>
</dependencies>
+ -->
+
<commandScript>
<script>scripts/historyserver.py</script>
<scriptType>PYTHON</scriptType>
@@ -369,6 +381,7 @@
<config-type>hdfs-site</config-type>
<config-type>hadoop-env</config-type>
<config-type>core-site</config-type>
+ <config-type>yarn-site</config-type>
<config-type>mapred-site</config-type>
<config-type>mapred-env</config-type>
<config-type>ssl-client</config-type>