Merge branch 'branch-2.6' into branch-feature-AMBARI-21450

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

Branch: refs/heads/branch-2.6
Commit: cf1ab7575eb9872eac66dafc504e62a4da44c41b
Parents: 2307c9d 6d50cd6
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Thu Aug 10 13:11:09 2017 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
Committed: Thu Aug 10 13:48:14 2017 -0400

----------------------------------------------------------------------
 .../upgrade/StackUpgradeFinishListener.java         | 13 +++++++++++++
 .../metadata/CachedRoleCommandOrderProvider.java    | 10 ++++++++--
 ambari-server/src/main/resources/scripts/configs.py |  2 +-
 .../stacks/BigInsights/4.2.5/repos/repoinfo.xml     | 16 ++++++++++++++--
 .../HDP/2.0.6/hooks/before-START/scripts/params.py  |  6 +++---
 .../upgrade/StackUpgradeFinishListenerTest.java     | 14 ++++++--------
 6 files changed, 45 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/cf1ab757/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --cc 
ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index bd86b50,bd86b50..de53150
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@@ -331,10 -331,10 +331,10 @@@ if dfs_ha_enabled
       namenode_rpc = nn_host
     pass
   pass
--elif 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
--  namenode_rpc = 
default('/configurations/hdfs-site/dfs.namenode.rpc-address', None)
  else:
--  namenode_rpc = default('/configurations/core-site/fs.defaultFS', None)
++  namenode_rpc = 
default('/configurations/hdfs-site/dfs.namenode.rpc-address', None)
++  if namenode_rpc is None:
++    namenode_rpc = default('/configurations/core-site/fs.defaultFS', None)
  
  if namenode_rpc:
   port_str = namenode_rpc.split(':')[-1].strip()

Reply via email to