You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2013/11/19 16:19:23 UTC
git commit: AMBARI-3808. If hdfs-exclude-file config type already
exists then installing DATANODE (e.g. while adding new host) fails (Vitaly
Brodetskyi via dlysnichenko)
Updated Branches:
refs/heads/trunk e644a08e7 -> c7503231e
AMBARI-3808. If hdfs-exclude-file config type already exists then installing DATANODE (e.g. while adding new host) fails (Vitaly Brodetskyi via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/c7503231
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c7503231
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c7503231
Branch: refs/heads/trunk
Commit: c7503231e8b8caeafb71e579fab533117410fd72
Parents: e644a08
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Nov 19 17:15:45 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Nov 19 17:15:45 2013 +0200
----------------------------------------------------------------------
.../src/main/puppet/modules/hdp-hadoop/manifests/init.pp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c7503231/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 08330d7..1b69e12 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
@@ -190,7 +190,9 @@ class hdp-hadoop::initialize()
if (hdp_get_major_stack_version($hdp::params::stack_version) >= 2) {
if (hdp_is_empty($configuration) == false and hdp_is_empty($configuration['hdfs-site']) == false) {
- if (hdp_is_empty($configuration['hdfs-site']['dfs.hosts.exclude']) == false) {
+ if (hdp_is_empty($configuration['hdfs-site']['dfs.hosts.exclude']) == false) and
+ (hdp_is_empty($configuration['hdfs-exclude-file']) or
+ has_key($configuration['hdfs-exclude-file'], 'datanodes') == false) {
$exlude_file_path = $configuration['hdfs-site']['dfs.hosts.exclude']
file { $exlude_file_path :
ensure => present,