Updated Branches: refs/heads/trunk 842c4ba57 -> bd920a598
AMBARI-3176: hbase.tmp.dir setting should not be configured under /grid/0/var/log. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/bd920a59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/bd920a59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/bd920a59 Branch: refs/heads/trunk Commit: bd920a598152e8238d6fb9b6a91ab16468f621cd Parents: 842c4ba Author: Jaimin Jetly <[email protected]> Authored: Wed Sep 11 18:40:55 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Wed Sep 11 18:41:09 2013 -0700 ---------------------------------------------------------------------- .../modules/hdp-hbase/manifests/regionserver.pp | 6 +++--- .../puppet/modules/hdp-hbase/manifests/service.pp | 15 ++++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bd920a59/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp index bbdaf90..434f4f1 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/regionserver.pp @@ -46,17 +46,17 @@ class hdp-hbase::regionserver( service_state => $service_state } $create_pid_dir = true - $create_log_dir = true + $create_conf_dir = true } else { $create_pid_dir = false - $create_log_dir = false + $create_conf_dir = false } hdp-hbase::service{ 'regionserver': ensure => $service_state, create_pid_dir => $create_pid_dir, - create_log_dir => $create_log_dir + create_conf_dir => $create_conf_dir } #top level does not need anchors http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bd920a59/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp index 111438d..8ab9645 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/service.pp @@ -21,7 +21,7 @@ define hdp-hbase::service( $ensure = 'running', $create_pid_dir = true, - $create_log_dir = true, + $create_conf_dir = true, $initial_wait = undef) { include hdp-hbase::params @@ -34,6 +34,8 @@ define hdp-hbase::service( $cmd = "$hbase_daemon --config ${conf_dir}" $pid_dir = $hdp-hbase::params::hbase_pid_dir $pid_file = "${pid_dir}/hbase-hbase-${role}.pid" + $hbase_log_dir = $hdp-hbase::params::hbase_log_dir + $hbase_tmp_dir = $hdp-hbase::params::hbase_tmp_dir if ($ensure == 'running') { $daemon_cmd = "su - ${user} -c '${cmd} start ${role}'" @@ -55,10 +57,13 @@ define hdp-hbase::service( force => true } } - if ($create_log_dir == true) { - hdp::directory_recursive_create { $hdp-hbase::params::hbase_log_dir: + if ($create_conf_dir == true) { + # To avoid duplicate resource definitions + $hbase_conf_dirs = hdp_set_from_comma_list("${hbase_tmp_dir},${hbase_log_dir}") + + hdp::directory_recursive_create_ignore_failure { $hbase_conf_dirs: owner => $user, - tag => $tag, + context_tag => 'hbase_service', service_state => $ensure, force => true } @@ -74,4 +79,4 @@ define hdp-hbase::service( } else { anchor{"hdp-hbase::service::${name}::begin":} -> Hdp::Directory_recursive_create<|tag == $tag|> -> anchor{"hdp-hbase::service::${name}::end":} } -} +} \ No newline at end of file
