ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject git commit: AMBARI-3795. Hbase service check task returns with COMPLETED status even though puppet process returns with non-zero value. (Arsen Babych via mahadev)
Date Tue, 19 Nov 2013 06:53:16 GMT
Updated Branches:
  refs/heads/trunk 41172fef7 -> 3f6dc9bae


AMBARI-3795. Hbase service check task returns with COMPLETED status even though puppet process
returns with non-zero value. (Arsen Babych via 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/3f6dc9ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/3f6dc9ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/3f6dc9ba

Branch: refs/heads/trunk
Commit: 3f6dc9bae7f85968c0d0cfc9c63ac5257a683c68
Parents: 41172fe
Author: Mahadev Konar <mahadev@apache.org>
Authored: Mon Nov 18 22:53:03 2013 -0800
Committer: Mahadev Konar <mahadev@apache.org>
Committed: Mon Nov 18 22:53:03 2013 -0800

----------------------------------------------------------------------
 .../modules/hdp-hbase/manifests/hbase/service_check.pp    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/3f6dc9ba/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
index a5aaeb1..6bad593 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/hbase/service_check.pp
@@ -22,17 +22,23 @@ class hdp-hbase::hbase::service_check() inherits hdp-hbase::params
 {
   $smoke_test_user = $hdp::params::smokeuser
   $security_enabled = $hdp::params::security_enabled
-  $output_file = "/apps/hbase/data/ambarismoketest"
   $conf_dir = $hdp::params::hbase_conf_dir
   $smoke_user_keytab = $hdp::params::smokeuser_keytab
   $hbase_user = $hdp-hbase::params::hbase_user
   $hbase_keytab = $hdp::params::hbase_user_keytab
-  $test_cmd = "fs -test -e ${output_file}"
   $serviceCheckData = hdp_unique_id_and_date()
   $kinit_cmd = "${hdp::params::kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user};"
 
   anchor { 'hdp-hbase::hbase::service_check::begin':}
 
+  if (hdp_get_major_stack_version($hdp::params::stack_version) >= 2){
+    $output_file = "${hbase_hdfs_root_dir}/data/default/ambarismoketest"
+  } else {
+    $output_file = "${hbase_hdfs_root_dir}/ambarismoketest"
+  }
+
+  $test_cmd = "fs -test -e ${output_file}"
+
   $hbase_servicecheck_file = '/tmp/hbase-smoke.sh'
 
   file { '/tmp/hbaseSmokeVerify.sh':


Mime
View raw message