Repository: ambari Updated Branches: refs/heads/trunk 1073da759 -> 68f9cb88e
AMBARI-8800. Upgrade Core Masters failed on NameNode Restart (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/68f9cb88 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/68f9cb88 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/68f9cb88 Branch: refs/heads/trunk Commit: 68f9cb88e04a8b7c12e18f41762301dad81187a6 Parents: 1073da7 Author: Nate Cole <[email protected]> Authored: Thu Dec 18 14:28:21 2014 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Dec 18 14:44:46 2014 -0500 ---------------------------------------------------------------------- .../HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/68f9cb88/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 9f470a3..e8dbc59 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 @@ -49,6 +49,10 @@ def namenode(action=None, do_format=True, rolling_restart=False, env=None): options = "-rollingUpgrade started" if rolling_restart else "" + if rolling_restart: + # Must start Zookeeper Failover Controller if it exists on this host because it could have been killed in order to initiate the failover. + safe_zkfc_op(action, env) + service( action="start", name="namenode", @@ -58,9 +62,6 @@ def namenode(action=None, do_format=True, rolling_restart=False, env=None): create_log_dir=True ) - if rolling_restart: - # Must start Zookeeper Failover Controller if it exists on this host because it could have been killed in order to initiate the failover. - safe_zkfc_op(action, env) if params.security_enabled: Execute(format("{kinit_path_local} -kt {hdfs_user_keytab} {hdfs_principal_name}"),
