You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/04/30 02:40:29 UTC
svn commit: r1477429 - in /incubator/ambari/trunk: ./
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/
ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/
ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/
ambari-agent/src/main/p...
Author: swagle
Date: Tue Apr 30 00:40:29 2013
New Revision: 1477429
URL: http://svn.apache.org/r1477429
Log:
AMBARI-2047. Create ambari agent scripts for historyserver. (swagle)
Added:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp
Removed:
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/capacity-scheduler.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/yarn-site.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/YARN/configuration/mapred-queue-acls.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/YARN/configuration/mapred-site.xml
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/configfile.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/HDFS/configuration/global.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 30 00:40:29 2013
@@ -12,6 +12,8 @@ Trunk (unreleased changes):
NEW FEATURES
+ AMBARI-2047. Create ambari agent scripts for historyserver. (swagle)
+
AMBARI-2046. Create ambari agent scripts for Hadoop 2.0 installation, node
manager. (swagle)
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp Tue Apr 30 00:40:29 2013
@@ -167,14 +167,37 @@ define hdp-hadoop::namenode::create_app_
}
if $stack_version in ("2.0.1") {
- if ($hdp::params::yarn_log_aggregation_enabled == "true") {
- $yarn_user = $hdp::params::yarn_user
- $yarn_nm_app_log_dir = $hdp::params::yarn_nm_app_log_dir
+ if ($hdp::params::nm_host != "") {
+ if ($hdp::params::yarn_log_aggregation_enabled == "true") {
+ $yarn_user = $hdp::params::yarn_user
+ $yarn_nm_app_log_dir = $hdp::params::yarn_nm_app_log_dir
+
+ hdp-hadoop::hdfs::directory{ $yarn_nm_app_log_dir:
+ service_state => $service_state,
+ owner => $yarn_user,
+ mode => '744',
+ recursive_chmod => true
+ }
+ }
+ }
+
+
+ if ($hdp::params::hs_host != "") {
+ $mapred_user = $hdp::params::mapred_user
+ $mapreduce_jobhistory_intermediate_done_dir = $hdp::params::mapreduce_jobhistory_intermediate_done_dir
+ $mapreduce_jobhistory_done_dir = $hdp::params::mapreduce_jobhistory_done_dir
+
+ hdp-hadoop::hdfs::directory{ $mapreduce_jobhistory_intermediate_done_dir:
+ service_state => $service_state,
+ owner => $mapred_user,
+ mode => '777',
+ recursive_chmod => true
+ }
- hdp-hadoop::hdfs::directory{ $yarn_nm_app_log_dir:
+ hdp-hadoop::hdfs::directory{ $mapreduce_jobhistory_done_dir:
service_state => $service_state,
- owner => $yarn_user,
- mode => '744',
+ owner => $mapred_user,
+ mode => '750',
recursive_chmod => true
}
}
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp Tue Apr 30 00:40:29 2013
@@ -79,6 +79,10 @@ class hdp-hadoop::params(
$mapreduce_libs_path = hdp_default("mapreduce_libs_path","/usr/lib/hadoop-mapreduce/*")
+ $mapred_log_dir_prefix = hdp_default("mapred_log_dir_prefix","/var/log/hadoop-mapreduce")
+
+ $mapred_pid_dir_prefix = hdp_default("mapreduce_libs_path","/var/run/hadoop-mapreduce")
+
### compression related
if (($hdp::params::lzo_enabled == true) and ($hdp::params::snappy_enabled == true)) {
$mapred_compress_map_output = true
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb Tue Apr 30 00:40:29 2013
@@ -62,6 +62,8 @@ export HADOOP_SSH_OPTS="-o ConnectTimeou
# Where log files are stored. $HADOOP_HOME/logs by default.
export HADOOP_LOG_DIR=<%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/$USER
+# History server logs
+export HADOOP_MAPRED_LOG_DIR=<%=scope.function_hdp_template_var("mapred_log_dir_prefix")%>/$USER
# Where log files are stored in the secure data environment.
export HADOOP_SECURE_DN_LOG_DIR=<%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/$HADOOP_SECURE_DN_USER
@@ -81,6 +83,9 @@ export HADOOP_SECURE_DN_LOG_DIR=<%=scope
export HADOOP_PID_DIR=<%=scope.function_hdp_template_var("hadoop_pid_dir_prefix")%>/$USER
export HADOOP_SECURE_DN_PID_DIR=<%=scope.function_hdp_template_var("hadoop_pid_dir_prefix")%>/$HADOOP_SECURE_DN_USER
+# History server pid
+export HADOOP_MAPRED_PID_DIR=<%=scope.function_hdp_template_var("mapred_pid_dir_prefix")%>/$USER
+
# A string representing this instance of hadoop. $USER by default.
export HADOOP_IDENT_STRING=$USER
Added: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp?rev=1477429&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp (added)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/historyserver.pp Tue Apr 30 00:40:29 2013
@@ -0,0 +1,48 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+class hdp-yarn::historyserver(
+ $service_state = $hdp::params::cluster_service_state,
+ $opts = {}
+) inherits hdp-yarn::params
+{
+ $mapred_user = $hdp-yarn::params::mapred_user
+
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in 'installed_and_configured') {
+
+ include hdp-yarn::initialize
+
+ ##Process package
+ hdp-yarn::package{'mapreduce-historyserver':}
+
+ } elsif ($service_state in ['running','stopped']) {
+
+ include hdp-yarn::initialize
+
+ hdp-yarn::service{ 'historyserver':
+ ensure => $service_state,
+ user => $mapred_user
+ }
+
+ } else {
+ hdp_fail("TODO not implemented yet: service_state = ${service_state}")
+ }
+}
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/init.pp Tue Apr 30 00:40:29 2013
@@ -22,13 +22,17 @@
class hdp-yarn::initialize()
{
$yarn_user = $hdp-yarn::params::yarn_user
+ $mapred_user = $hdp-yarn::params::mapred_user
##Process package
hdp-yarn::package{'yarn-common':}
- # Create user
+ # Create yarn user
hdp::user { $yarn_user:}
+ # Create mapred user
+ hdp::user { $mapred_user:}
+
#Generate common configs
hdp-yarn::generate_common_configs{'yarn-common-configs':}
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp Tue Apr 30 00:40:29 2013
@@ -19,12 +19,12 @@
#
#
class hdp-yarn::params(
-) inherits hdp::params
+) inherits hdp-hadoop::params
{
$conf_dir = $hdp::params::yarn_conf_dir
-
- ## yarn-env
+
+ ## yarn-env
$hadoop_libexec_dir = hdp_default("yarn/yarn-env/hadoop_libexec_dir","/usr/lib/hadoop/libexec")
$hadoop_common_home = hdp_default("yarn/yarn-env/hadoop_common_home","/usr/lib/hadoop")
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp Tue Apr 30 00:40:29 2013
@@ -28,15 +28,25 @@ define hdp-yarn::service(
{
$security_enabled = $hdp::params::security_enabled
- $log_dir = "${hdp-yarn::params::yarn_log_dir_prefix}"
- $pid_dir = "${hdp-yarn::params::yarn_pid_dir_prefix}/${user}"
- $yarn_daemon = "${hdp::params::yarn_bin}/yarn-daemon.sh"
+
+ if ($name == 'historyserver') {
+ $log_dir = "${hdp-yarn::params::mapred_log_dir_prefix}"
+ $pid_dir = "${hdp-yarn::params::mapred_pid_dir_prefix}/${user}"
+ $daemon = "${hdp::params::mapred_bin}/mr-jobhistory-daemon.sh"
+ $pid_file = "${pid_dir}/mapred-${user}-${name}.pid"
+ } else {
+ $log_dir = "${hdp-yarn::params::yarn_log_dir_prefix}"
+ $pid_dir = "${hdp-yarn::params::yarn_pid_dir_prefix}/${user}"
+ $daemon = "${hdp::params::yarn_bin}/yarn-daemon.sh"
+ $pid_file = "${pid_dir}/yarn-${user}-${name}.pid"
+ }
+
$hadoop_libexec_dir = $hdp-yarn::params::hadoop_libexec_dir
- $cmd = "export HADOOP_LIBEXEC_DIR=${hadoop_libexec_dir} && ${yarn_daemon} --config ${hdp-yarn::params::conf_dir}"
+ $cmd = "export HADOOP_LIBEXEC_DIR=${hadoop_libexec_dir} && ${daemon} --config ${hdp-yarn::params::conf_dir}"
- $pid_file = "${pid_dir}/yarn-${user}-${name}.pid"
+
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/configfile.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/configfile.pp?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/configfile.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/configfile.pp Tue Apr 30 00:40:29 2013
@@ -29,6 +29,9 @@ define hdp::configfile(
$namenode_host = $hdp::params::namenode_host,
$jtnode_host = $hdp::params::jtnode_host,
$snamenode_host = $hdp::params::snamenode_host,
+ $rm_host = $hdp::params::rm_host,
+ $nm_hosts = $hdp::params::nm_hosts,
+ $hs_host = $hdp::params::hs_host,
$slave_hosts = $hdp::params::slave_hosts,
$mapred_tt_hosts = $hdp::params::mapred_tt_hosts,
$all_hosts = $hdp::params::all_hosts,
@@ -46,6 +49,9 @@ define hdp::configfile(
$gateway_host = $hdp::params::gateway_host,
$public_namenode_host = $hdp::params::public_namenode_host,
$public_snamenode_host = $hdp::params::public_snamenode_host,
+ $public_rm_host = $hdp::params::public_rm_host,
+ $public_nm_hosts = $hdp::params::public_nm_hosts,
+ $public_hs_host = $hdp::params::public_hs_host,
$public_jtnode_host = $hdp::params::public_jtnode_host,
$public_hbase_master_hosts = $hdp::params::public_hbase_master_hosts,
$public_zookeeper_hosts = $hdp::params::public_zookeeper_hosts,
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp Tue Apr 30 00:40:29 2013
@@ -62,6 +62,10 @@ class hdp::params()
$jtnode_host = hdp_default("jtnode_host")
$slave_hosts = hdp_default("slave_hosts")
+ $rm_host = hdp_default("rm_host")
+ $nm_hosts = hdp_default("nm_hosts")
+ $hs_host = hdp_default("hs_host")
+
$zookeeper_hosts = hdp_default("zookeeper_hosts")
$hbase_master_hosts = hdp_default("hbase_master_hosts", "")
@@ -127,6 +131,9 @@ class hdp::params()
if ($hostAttributes != undef) {
$public_namenode_host = hdp_host_attribute($hostAttributes,"publicfqdn",$namenode_host)
$public_snamenode_host = hdp_host_attribute($hostAttributes,"publicfqdn",$snamenode_host)
+ $public_rm_host = hdp_host_attribute($hostAttributes,"publicfqdn",$rm_host)
+ $public_nm_hosts = hdp_host_attribute($hostAttributes,"publicfqdn",$nm_hosts)
+ $public_hs_host = hdp_host_attribute($hostAttributes,"publicfqdn",$hs_host)
$public_jtnode_host = hdp_host_attribute($hostAttributes,"publicfqdn",$jtnode_host)
$public_hbase_master_hosts = hdp_host_attribute($hostAttributes,"publicfqdn",$hbase_master_hosts)
$public_zookeeper_hosts = hdp_host_attribute($hostAttributes,"publicfqdn",$zookeeper_hosts)
@@ -139,6 +146,9 @@ class hdp::params()
} else {
$public_namenode_host = hdp_default("namenode_host")
$public_snamenode_host = hdp_default("snamenode_host")
+ $public_rm_host = hdp_default("rm_host")
+ $public_nm_hosts = hdp_default("nm_hosts")
+ $public_hs_host = hdp_default("hs_host")
$public_jtnode_host = hdp_default("jtnode_host")
$public_hbase_master_hosts = hdp_default("hbase_master_hosts")
$public_zookeeper_hosts = hdp_default("zookeeper_hosts")
@@ -192,11 +202,15 @@ class hdp::params()
$hive_apps_whs_dir = hdp_default("hive_apps_whs_dir", "/apps/hive/warehouse")
$webhcat_apps_dir = hdp_default("webhcat_apps_dir", "/apps/webhcat")
$hbase_hdfs_root_dir = hdp_default("hbase-site/hbase.hdfs.root.dir","/apps/hbase/data")
-
+
$yarn_nm_app_log_dir = hdp_default("yarn-site/yarn.nodemanager.remote-app-log-dir","/app-logs")
-
+
$yarn_log_aggregation_enabled = hdp_default("yarn-site/yarn.log-aggregation-enable","true")
+ $mapreduce_jobhistory_intermediate_done_dir = hdp_default("mapred-site/mapreduce.jobhistory.intermediate-done-dir","/mr-history/tmp")
+
+ $mapreduce_jobhistory_done_dir = hdp_default("mapred-site/mapreduce.jobhistory.done-dir","/mr-history/done")
+
$user_group = hdp_default("user_group","hadoop")
$ganglia_enabled = hdp_default("ganglia_enabled",true)
@@ -291,6 +305,7 @@ class hdp::params()
$hadoop_bin = "/usr/lib/hadoop/bin"
}
$yarn_bin = "/usr/lib/hadoop-yarn/sbin"
+ $mapred_bin = "/usr/lib/hadoop-mapreduce/sbin"
$hadoop_conf_dir = "/etc/hadoop/conf"
$yarn_conf_dir = "/etc/hadoop/conf"
$zk_conf_dir = "/etc/zookeeper/conf"
@@ -413,6 +428,14 @@ class hdp::params()
}
},
+ mapreduce-historyserver => {
+ 'ALL' => {
+ 64 => {
+ 'ALL' => ['hadoop-mapreduce-historyserver']
+ }
+ }
+ },
+
lzo => {
'ALL' => {
'ALL' => {
Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java Tue Apr 30 00:40:29 2013
@@ -86,6 +86,18 @@ public class RoleCommandOrder {
public static void initialize() {
addDependency(Role.SECONDARY_NAMENODE, RoleCommand.START, Role.NAMENODE,
RoleCommand.START);
+ addDependency(Role.RESOURCEMANAGER, RoleCommand.START, Role.NAMENODE,
+ RoleCommand.START);
+ addDependency(Role.RESOURCEMANAGER, RoleCommand.START, Role.DATANODE,
+ RoleCommand.START);
+ addDependency(Role.NODEMANAGER, RoleCommand.START, Role.NAMENODE,
+ RoleCommand.START);
+ addDependency(Role.NODEMANAGER, RoleCommand.START, Role.DATANODE,
+ RoleCommand.START);
+ addDependency(Role.HISTORYSERVER, RoleCommand.START, Role.NAMENODE,
+ RoleCommand.START);
+ addDependency(Role.HISTORYSERVER, RoleCommand.START, Role.DATANODE,
+ RoleCommand.START);
addDependency(Role.HBASE_MASTER, RoleCommand.START, Role.ZOOKEEPER_SERVER,
RoleCommand.START);
addDependency(Role.HBASE_MASTER, RoleCommand.START, Role.NAMENODE,
@@ -136,6 +148,8 @@ public class RoleCommandOrder {
Role.JOBTRACKER, RoleCommand.START);
addDependency(Role.MAPREDUCE_SERVICE_CHECK, RoleCommand.EXECUTE,
Role.TASKTRACKER, RoleCommand.START);
+ addDependency(Role.RESOURCEMANAGER_SERVICE_CHECK, RoleCommand.EXECUTE,
+ Role.RESOURCEMANAGER, RoleCommand.START);
addDependency(Role.OOZIE_SERVICE_CHECK, RoleCommand.EXECUTE,
Role.OOZIE_SERVER, RoleCommand.START);
addDependency(Role.WEBHCAT_SERVICE_CHECK, RoleCommand.EXECUTE,
@@ -177,10 +191,22 @@ public class RoleCommandOrder {
Role.JOBTRACKER, RoleCommand.STOP);
addDependency(Role.NAMENODE, RoleCommand.STOP,
Role.TASKTRACKER, RoleCommand.STOP);
+ addDependency(Role.NAMENODE, RoleCommand.STOP,
+ Role.RESOURCEMANAGER, RoleCommand.STOP);
+ addDependency(Role.NAMENODE, RoleCommand.STOP,
+ Role.NODEMANAGER, RoleCommand.STOP);
+ addDependency(Role.NAMENODE, RoleCommand.STOP,
+ Role.HISTORYSERVER, RoleCommand.STOP);
addDependency(Role.DATANODE, RoleCommand.STOP,
Role.JOBTRACKER, RoleCommand.STOP);
addDependency(Role.DATANODE, RoleCommand.STOP,
Role.TASKTRACKER, RoleCommand.STOP);
+ addDependency(Role.DATANODE, RoleCommand.STOP,
+ Role.RESOURCEMANAGER, RoleCommand.STOP);
+ addDependency(Role.DATANODE, RoleCommand.STOP,
+ Role.NODEMANAGER, RoleCommand.STOP);
+ addDependency(Role.DATANODE, RoleCommand.STOP,
+ Role.HISTORYSERVER, RoleCommand.STOP);
addDependency(Role.SECONDARY_NAMENODE, RoleCommand.UPGRADE,
Role.NAMENODE, RoleCommand.UPGRADE);
Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java Tue Apr 30 00:40:29 2013
@@ -86,6 +86,9 @@ public class StageUtils {
componentToClusterInfoKeyMap.put("NAMENODE", "namenode_host");
componentToClusterInfoKeyMap.put("JOBTRACKER", "jtnode_host");
componentToClusterInfoKeyMap.put("SNAMENODE", "snamenode_host");
+ componentToClusterInfoKeyMap.put("RESOURCEMANAGER", "rm_host");
+ componentToClusterInfoKeyMap.put("NODEMANAGER", "nm_hosts");
+ componentToClusterInfoKeyMap.put("HISTORYSERVER", "hs_host");
componentToClusterInfoKeyMap.put("ZOOKEEPER_SERVER", "zookeeper_hosts");
componentToClusterInfoKeyMap.put("HBASE_MASTER", "hbase_master_hosts");
componentToClusterInfoKeyMap.put("HBASE_REGIONSERVER", "hbase_rs_hosts");
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/HDFS/configuration/global.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/HDFS/configuration/global.xml?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/HDFS/configuration/global.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/HDFS/configuration/global.xml Tue Apr 30 00:40:29 2013
@@ -37,6 +37,21 @@
<description>Secondary NameNode.</description>
</property>
<property>
+ <name>rm_host</name>
+ <value></value>
+ <description>Resource Manager.</description>
+ </property>
+ <property>
+ <name>nm_hosts</name>
+ <value></value>
+ <description>List of Node Manager Hosts.</description>
+ </property>
+ <property>
+ <name>hs_host</name>
+ <value></value>
+ <description>History Server.</description>
+ </property>
+ <property>
<name>fs_checkpoint_dir</name>
<value>/hadoop/hdfs/namesecondary</value>
<description>Secondary NameNode checkpoint dir.</description>
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml?rev=1477429&r1=1477428&r2=1477429&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml Tue Apr 30 00:40:29 2013
@@ -528,4 +528,22 @@ user)</description>
<description> Comma separated list of queues configured for this jobtracker.</description>
</property>
+<property>
+ <name>mapreduce.shuffle.port</name>
+ <value>8081</value>
+ <description>Default port that the ShuffleHandler will run on. ShuffleHandler is a service run at the NodeManager to facilitate transfers of intermediate Map outputs to requesting Reducers.</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>Directory where history files are written by MapReduce jobs.</description>
+</property>
+
+<property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>Directory where history files are managed by the MR JobHistory Server.</description>
+</property>
+
</configuration>