Author: swagle
Date: Tue Apr 30 00:30:27 2013
New Revision: 1477424
URL: http://svn.apache.org/r1477424
Log:
AMBARI-2047. Create ambari agent scripts for yarn client. (swagle)
Added:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn_client.pp
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/Role.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1477424&r1=1477423&r2=1477424&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 30 00:30:27 2013
@@ -12,6 +12,8 @@ Trunk (unreleased changes):
NEW FEATURES
+ AMBARI-2047. Create ambari agent scripts for yarn client. (swagle)
+
AMBARI-1679. Create ambari agent scripts for Hadoop 2.0 installation,
configuration and management. (swagle)
Added:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn_client.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn_client.pp?rev=1477424&view=auto
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn_client.pp
(added)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn_client.pp
Tue Apr 30 00:30:27 2013
@@ -0,0 +1,34 @@
+#
+#
+# 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::yarn_client(
+ $service_state = $hdp::params::cluster_service_state,
+ $opts = {}
+) inherits hdp-yarn::params
+{
+ if ($service_state == 'no_op') {
+ } elsif ($service_state in 'installed_and_configured') {
+
+ include hdp-yarn::initialize
+
+ } 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/python/ambari_agent/AmbariConfig.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py?rev=1477424&r1=1477423&r2=1477424&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
Tue Apr 30 00:30:27 2013
@@ -83,8 +83,12 @@ rolesToClass = {
'JOBTRACKER': 'hdp-hadoop::jobtracker',
'TASKTRACKER': 'hdp-hadoop::tasktracker',
'RESOURCEMANAGER': 'hdp-yarn::resourcemanager',
+ 'NODEMANAGER': 'hdp-yarn::nodemanager',
+ 'HISTORYSERVER': 'hdp-yarn::historyserver',
+ 'YARN_CLIENT': 'hdp-yarn::yarn_client',
'HDFS_CLIENT': 'hdp-hadoop::client',
'MAPREDUCE_CLIENT': 'hdp-hadoop::client',
+ 'MAPREDUCEv2_CLIENT': 'hdp-yarn::mapreducev2_client',
'ZOOKEEPER_SERVER': 'hdp-zookeeper',
'ZOOKEEPER_CLIENT': 'hdp-zookeeper::client',
'HBASE_MASTER': 'hdp-hbase::master',
@@ -119,7 +123,8 @@ rolesToClass = {
'WEBHCAT_SERVICE_CHECK': 'hdp-templeton::templeton::service_check',
'DASHBOARD_SERVICE_CHECK': 'hdp-dashboard::dashboard::service_check',
'DECOMMISSION_DATANODE': 'hdp-hadoop::hdfs::decommission',
- 'HUE_SERVICE_CHECK': 'hdp-hue::service_check'
+ 'HUE_SERVICE_CHECK': 'hdp-hue::service_check',
+ 'RESOURCEMANAGER_SERVICE_CHECK': 'hdp-yarn::resourcemanager::service_check'
}
serviceStates = {
@@ -135,6 +140,8 @@ servicesToPidNames = {
'JOBTRACKER': 'hadoop-{USER}-jobtracker.pid$',
'TASKTRACKER': 'hadoop-{USER}-tasktracker.pid$',
'RESOURCEMANAGER': 'yarn-{USER}-resourcemanager.pid$',
+ 'NODEMANAGER': 'yarn-{USER}-nodemanager.pid$',
+ 'HISTORYSERVER': 'mapred-{USER}-historyserver.pid$',
'OOZIE_SERVER': 'oozie.pid',
'ZOOKEEPER_SERVER': 'zookeeper_server.pid',
'TEMPLETON_SERVER': 'templeton.pid',
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/Role.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/Role.java?rev=1477424&r1=1477423&r2=1477424&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/Role.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/Role.java
Tue Apr 30 00:30:27 2013
@@ -69,5 +69,9 @@ public enum Role {
DECOMMISSION_DATANODE,
HUE_SERVER,
AMBARI_SERVER_ACTION,
- RESOURCEMANAGER
+ RESOURCEMANAGER,
+ RESOURCEMANAGER_SERVICE_CHECK,
+ NODEMANAGER,
+ YARN_CLIENT,
+ HISTORYSERVER
}
