incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject git commit: AMBARI-3186. Upgrade fails because namenode start does not create necessary folders as namenode start does not retry. (swagle)
Date Wed, 11 Sep 2013 22:40:44 GMT
Updated Branches:
  refs/heads/trunk 2518fe128 -> 4ddff3e50


AMBARI-3186. Upgrade fails because namenode start does not create necessary folders as namenode
start does not retry. (swagle)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/4ddff3e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/4ddff3e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/4ddff3e5

Branch: refs/heads/trunk
Commit: 4ddff3e505cd44da9bab3a248408bfeeace0edfb
Parents: 2518fe1
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Wed Sep 11 15:25:59 2013 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Wed Sep 11 15:28:13 2013 -0700

----------------------------------------------------------------------
 .../main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4ddff3e5/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
index 78ac747..08993e1 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
@@ -51,8 +51,8 @@ define hdp-hadoop::hdfs::directory(
 
     hdp-hadoop::exec-hadoop { $mkdir_cmd:
       command   => $mkdir_cmd,
-      unless    => "$dfs_check_nn_status_cmd && $dir_exists",
-      onlyif    => "$dfs_check_nn_status_cmd && $namenode_safe_mode_off",
+      unless    => "$dfs_check_nn_status_cmd && $dir_exists && ! $namenode_safe_mode_off",
+      onlyif    => "$dfs_check_nn_status_cmd && ! $dir_exists",
       try_sleep => $try_sleep,
       tries     => $tries
     }


Mime
View raw message