You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/12/10 02:16:31 UTC
ambari git commit: AMBARI-14311. Provide a flag to skip NN format
using a global flag. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 40bd722f4 -> 7ba41b54a
AMBARI-14311. Provide a flag to skip NN format using a global flag. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7ba41b54
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7ba41b54
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7ba41b54
Branch: refs/heads/trunk
Commit: 7ba41b54a34f3e3cd2c3da1d0671d6f107ac9123
Parents: 40bd722
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Wed Dec 9 17:06:18 2015 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Wed Dec 9 17:06:18 2015 -0800
----------------------------------------------------------------------
.../HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py | 2 +-
.../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ba41b54/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
index 52e098e..004caff 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
@@ -59,7 +59,7 @@ def namenode(action=None, hdfs_binary=None, do_format=True, upgrade_type=None, e
Logger.info("Called service {0} with upgrade_type: {1}".format(action, str(upgrade_type)))
setup_ranger_hdfs(upgrade_type=upgrade_type)
import params
- if do_format:
+ if do_format and not params.hdfs_namenode_format_disabled:
format_namenode()
pass
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ba41b54/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index b67a4ae..0dc1758 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -215,7 +215,7 @@ namenode_dirs_stub_filename = "namenode_dirs_created"
smoke_hdfs_user_dir = format("/user/{smoke_user}")
smoke_hdfs_user_mode = 0770
-
+hdfs_namenode_format_disabled = default("/configurations/cluster-env/hdfs_namenode_format_disabled", False)
hdfs_namenode_formatted_mark_suffix = "/namenode-formatted/"
namenode_formatted_old_mark_dirs = ["/var/run/hadoop/hdfs/namenode-formatted",
format("{hadoop_pid_dir_prefix}/hdfs/namenode/formatted"),