Author: smohanty
Date: Fri May 31 01:11:59 2013
New Revision: 1488074
URL: http://svn.apache.org/r1488074
Log:
AMBARI-2241. OOZIE support in hadoop 2.0. (smohanty)
Modified:
incubator/ambari/branches/branch-1.4.0/CHANGES.txt
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
Modified: incubator/ambari/branches/branch-1.4.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/CHANGES.txt?rev=1488074&r1=1488073&r2=1488074&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-1.4.0/CHANGES.txt Fri May 31 01:11:59 2013
@@ -23,6 +23,8 @@ Branch 1.4.0:
BUG FIXES
+ AMBARI-2241. OOZIE support in hadoop 2.0. (smohanty)
+
AMBARI-2238. Hadoop 2: Cannot stop/start YARN and MR2 services. (yusaku)
AMBARI-2216. Hadoop2: Empty stack configuration values become 'null' on the
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh?rev=1488074&r1=1488073&r2=1488074&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh
Fri May 31 01:11:59 2013
@@ -63,7 +63,7 @@ export JTHOST=$7
export NNHOST=$8
export OOZIE_EXIT_CODE=0
-export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/mapred-site.xml
mapred.job.tracker`
+export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/yarn-site.xml
yarn.resourcemanager.address`
export NAMENODE=`getValueFromField ${hadoop_conf_dir}/core-site.xml
fs.default.name`
export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml
oozie.base.url`
export OOZIE_EXAMPLES_DIR=`rpm -ql oozie-client | grep
'oozie-examples.tar.gz$' | xargs dirname`
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp?rev=1488074&r1=1488073&r2=1488074&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp
Fri May 31 01:11:59 2013
@@ -33,7 +33,11 @@ class hdp-oozie::service(
$cmd = "env HADOOP_HOME=${hadoop_home} /usr/sbin/oozie_server.sh"
$pid_file = "${hdp-oozie::params::oozie_pid_dir}/oozie.pid"
$jar_location = $hdp::params::hadoop_jar_location
- $ext_js_path = "/usr/share/HDP-oozie/ext.zip"
+ if (hdp_get_major_stack_version($stack_version) >= 2) {
+ $ext_js_path = "/usr/share/HDP-oozie/ext-2.2.zip"
+ } else {
+ $ext_js_path = "/usr/share/HDP-oozie/ext.zip"
+ }
$security = $hdp::params::security_enabled
$oozie_keytab = $hdp-oozie::params::oozie_service_keytab
@@ -77,10 +81,18 @@ class hdp-oozie::service(
$cmd2 = "cd /usr/lib/oozie && mkdir -p ${oozie_tmp}"
$cmd3 = "cd /usr/lib/oozie && chown ${user}:${hdp::params::user_group}
${oozie_tmp}"
- $cmd4 = $jdbc_driver_name ? {
+ if (hdp_get_major_stack_version($stack_version) >= 2) {
+ $cmd4 = $jdbc_driver_name ? {
+ /(com.mysql.jdbc.Driver|oracle.jdbc.driver.OracleDriver)/ => "cd
${oozie_tmp} && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 2.x /usr/lib/ -extjs
$ext_js_path $jar_option $jar_path",
+ default => "cd ${oozie_tmp} &&
/usr/lib/oozie/bin/oozie-setup.sh -hadoop 2.x /usr/lib/ -extjs $ext_js_path
$jar_option $jar_path",
+ }
+ } else {
+ $cmd4 = $jdbc_driver_name ? {
/(com.mysql.jdbc.Driver|oracle.jdbc.driver.OracleDriver)/ => "cd
${oozie_tmp} && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200
$jar_location -extjs $ext_js_path $jar_option $jar_path",
default => "cd ${oozie_tmp} &&
/usr/lib/oozie/bin/oozie-setup.sh -hadoop 0.20.200 $jar_location -extjs
$ext_js_path $jar_option $jar_path",
+ }
}
+
$cmd5 = "cd ${oozie_tmp} && /usr/lib/oozie/bin/ooziedb.sh create -sqlfile
oozie.sql -run ; echo 0"
$cmd6 = "su - ${user} -c '${kinit_if_needed}; hadoop dfs -put
/usr/lib/oozie/share ${oozie_hdfs_user_dir} ; hadoop dfs -chmod -R 755
${oozie_hdfs_user_dir}/share'"
#$cmd7 = "/usr/lib/oozie/bin/oozie-start.sh"
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java?rev=1488074&r1=1488073&r2=1488074&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
Fri May 31 01:11:59 2013
@@ -105,6 +105,8 @@ public class RoleCommandOrder {
RoleCommand.START);
addDependency(Role.NODEMANAGER, RoleCommand.START, Role.DATANODE,
RoleCommand.START);
+ addDependency(Role.NODEMANAGER, RoleCommand.START, Role.RESOURCEMANAGER,
+ RoleCommand.START);
addDependency(Role.HISTORYSERVER, RoleCommand.START, Role.NAMENODE,
RoleCommand.START);
addDependency(Role.HISTORYSERVER, RoleCommand.START, Role.DATANODE,
Modified:
incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java?rev=1488074&r1=1488073&r2=1488074&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
(original)
+++
incubator/ambari/branches/branch-1.4.0/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java
Fri May 31 01:11:59 2013
@@ -78,8 +78,8 @@ public class RoleGraphTest {
RoleGraphNode hs_start = new RoleGraphNode(Role.HISTORYSERVER,
RoleCommand.START);
Assert.assertEquals(-1, rco.order(rm_start, mapred2_service_check));
Assert.assertEquals(-1, rco.order(nm_start, mapred2_service_check));
- Assert.assertEquals(-1, rco.order(hs_start, mapred2_service_check));
- Assert.assertEquals(-1, rco.order(hs_start, mapred2_service_check));
-
+ Assert.assertEquals(-1, rco.order(hs_start, mapred2_service_check));
+ Assert.assertEquals(-1, rco.order(hs_start, mapred2_service_check));
+ Assert.assertEquals(1, rco.order(nm_start, rm_start));
}
}
