Updated Branches: refs/heads/branch-1.4 4c5ad03a2 -> 3084ff466
AMBARI-2983. Change YARN Service check to not use distrbuted shell. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/3084ff46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/3084ff46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/3084ff46 Branch: refs/heads/branch-1.4 Commit: 3084ff466ec67732f28ced33b2d4d35aaf9f28e9 Parents: 4c5ad03 Author: Mahadev Konar <[email protected]> Authored: Wed Aug 21 15:43:39 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Wed Aug 21 16:24:48 2013 -0700 ---------------------------------------------------------------------- .../puppet/modules/hdp-hadoop/manifests/init.pp | 20 ++++++++++++-------- .../hdp-yarn/manifests/yarn/service_check.pp | 7 ++++--- 2 files changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3084ff46/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp index bd63543..989c795 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp @@ -438,13 +438,17 @@ define hdp-hadoop::exec-hadoop( } else { $kinit_if_needed = "" } - - if ($echo_yes == true) { - $cmd = "yes Y | hadoop --config ${conf_dir} ${command}" - } else { - $cmd = "hadoop --config ${conf_dir} ${command}" - } - + + if ($path == undef) { + if ($echo_yes == true) { + $cmd = "yes Y | hadoop --config ${conf_dir} ${command}" + } else { + $cmd = "hadoop --config ${conf_dir} ${command}" + } + } else { + $cmd = "${path} ${command}" + } + if ($kinit_if_needed != "") { exec { "kinit_before_${cmd}": command => $kinit_if_needed, @@ -462,6 +466,6 @@ define hdp-hadoop::exec-hadoop( timeout => $timeout, try_sleep => $try_sleep, logoutput => $logoutput, - onlyif => $onlyif + onlyif => $onlyif, } } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3084ff46/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn/service_check.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn/service_check.pp index fe053ac..4f2fffe 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn/service_check.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/yarn/service_check.pp @@ -22,16 +22,17 @@ class hdp-yarn::yarn::service_check() inherits hdp-yarn::params { $jar_path = "$hadoop_yarn_home/$distrAppJarName" - $run_dist_shell_app_cmd = "jar $jar_path -appname yarnservicecheck -master_memory 512 -container_memory 128 -num_containers 2 -shell_command \"ls\" -jar $jar_path" + $run_yarn_check_cmd = "node -list" ## Check availability of REST api hdp-yarn::smoketest{'hdp-yarn::smoketest:rm': component_name => 'resourcemanager'} ## Run distributed shell application check hdp-hadoop::exec-hadoop { 'hdp-yarn::yarn::service_check': - command => $run_dist_shell_app_cmd, + path => '/usr/bin/yarn', + command => $run_yarn_check_cmd, user => $smoke_test_user } anchor{"hdp-yarn::yarn::service_check::begin":} -> Hdp-yarn::Smoketest['hdp-yarn::smoketest:rm'] -> Hdp-hadoop::Exec-hadoop['hdp-yarn::yarn::service_check'] -> anchor{"hdp-yarn::yarn::service_check::end":} -} \ No newline at end of file +}
