svn commit: r1489488 - in /incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests: mapred2/service_check.pp params.pp

[nc...@apache.org]

Author: ncole
Date: Tue Jun  4 15:48:51 2013
New Revision: 1489488

URL: http://svn.apache.org/r1489488
Log:
AMBARI-2276. Hadoop 2: YARN/MR2 service checks cannot be stack-specific. (Oleksander Diachenko via ncole)

Modified:
    incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
    incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp?rev=1489488&r1=1489487&r2=1489488&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/mapred2/service_check.pp Tue Jun  4 15:48:51 2013
@@ -18,11 +18,11 @@
 # under the License.
 #
 #
-class hdp-yarn::mapred2::service_check()
+class hdp-yarn::mapred2::service_check() inherits hdp-yarn::params
 {
   $smoke_test_user = $hdp::params::smokeuser
-
-  $jar_location = $hdp::params::hadoop_mapred2_jar_location
+  $hadoopMapredExamplesJarName = $hdp-yarn::params::hadoopMapredExamplesJarName
+  $jar_path = "$hdp::params::hadoop_mapred2_jar_location/$hadoopMapredExamplesJarName"
   $input_file = "/user/${smoke_test_user}/mapredsmokeinput"
   $output_file = "/user/${smoke_test_user}/mapredsmokeoutput"
   $hadoop_conf_dir = $hdp::params::hadoop_conf_dir
@@ -30,7 +30,7 @@ class hdp-yarn::mapred2::service_check()
   $cleanup_cmd = "fs -rm -r -f ${output_file} ${input_file}"
   $create_file_cmd = "fs -put /etc/passwd ${input_file}"
   $test_cmd = "fs -test -e ${output_file}"
-  $run_wordcount_job = "jar ${jar_location}/hadoop-mapreduce-examples-2.0.3.22-alpha.jar wordcount ${input_file} ${output_file}"
+  $run_wordcount_job = "jar $jar_path wordcount ${input_file} ${output_file}"
 
   anchor { 'hdp-yarn::mapred2::service_check::begin':}
 

Modified: incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp?rev=1489488&r1=1489487&r2=1489488&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp (original)
+++ incubator/ambari/branches/branch-1.4.0/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/params.pp Tue Jun  4 15:48:51 2013
@@ -45,11 +45,6 @@ class hdp-yarn::params(
   $nm_log_dirs = hdp_default("yarn-site/yarn.nodemanager.log-dirs", "/var/log/hadoop-yarn/yarn")
 
   ##smoke test configs
-  $distrAppJarNameToStack = {'2.0.1' => "hadoop-yarn-applications-distributedshell-2.0.3.22-alpha.jar"}
-
-  $distrAppJarName = $distrAppJarNameToStack[$stack_version]
-  
-  if hdp_is_empty($distrAppJarName) {
-    hdp_fail("No yarn-applications-distributedshell jar for stack: $stack_version")
-  }
+  $distrAppJarName = "hadoop-yarn-applications-distributedshell-2.*.jar"
+  $hadoopMapredExamplesJarName = "hadoop-mapreduce-examples-2.*.jar"
 }