You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2017/10/09 18:34:17 UTC

[03/50] [abbrv] ambari git commit: AMBARI-21664. HDFS namenode rpc and connection load metrics are not showing. Addendum. (swagle)

AMBARI-21664. HDFS namenode rpc and connection load metrics are not showing. Addendum. (swagle)

(cherry picked from commit f153268797c3d448a741ceef5dd92dd8e3d7cb48)

Change-Id: I45d693ad09708cfb7ab782ff16e583bb185f07f0


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

Branch: refs/heads/2.5-maint
Commit: 117f4f39d629e56dd895f1d521cefe2f35ac8617
Parents: 7f01766
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Aug 10 13:47:13 2017 -0700
Committer: swagle@hortonworks.com <je...@hortonworks.com>
Committed: Thu Aug 10 21:01:39 2017 +0000

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/117f4f39/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git 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
index bd86b50..5554941 100644
--- 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,7 +331,7 @@ if dfs_ha_enabled:
      namenode_rpc = nn_host
    pass
  pass
-elif 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
+elif 'hdfs-site' in config['configurations'] and '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)
@@ -341,7 +341,7 @@ if namenode_rpc:
  try:
    nn_rpc_client_port = int(port_str)
  except ValueError:
-   nn_rpc_client_port = None
+   pass
 
 if dfs_ha_enabled:
  dfs_service_rpc_address = default(format('/configurations/hdfs-site/dfs.namenode.servicerpc-address.{dfs_ha_nameservices}.{namenode_id}'), None)