You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/12/22 17:08:29 UTC
[25/26] ambari git commit: AMBARI-19282. HA HDFS propreties may be
written in different case, which prevents operations (aonishuk)
AMBARI-19282. HA HDFS propreties may be written in different case, which prevents operations (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc1b7ab8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc1b7ab8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc1b7ab8
Branch: refs/heads/branch-dev-patch-upgrade
Commit: bc1b7ab8c0f290879ce878a9c8cd028ecb51d45f
Parents: a100c0b
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Dec 22 18:44:30 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Dec 22 18:44:30 2016 +0200
----------------------------------------------------------------------
.../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../HDFS/2.1.0.2.0/package/scripts/params_windows.py | 2 +-
.../common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py | 2 +-
.../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc1b7ab8/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 b04fce3..21e7b68 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
@@ -296,7 +296,7 @@ if dfs_ha_namenode_ids:
if dfs_ha_enabled:
for nn_id in dfs_ha_namemodes_ids_list:
nn_host = config['configurations']['hdfs-site'][format('dfs.namenode.rpc-address.{dfs_ha_nameservices}.{nn_id}')]
- if hostname in nn_host:
+ if hostname.lower() in nn_host.lower():
namenode_id = nn_id
namenode_rpc = nn_host
# With HA enabled namenode_address is recomputed
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc1b7ab8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
index 70d95a6..1e47c29 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py
@@ -59,7 +59,7 @@ if dfs_ha_namenode_ids:
if dfs_ha_enabled:
for nn_id in dfs_ha_namemodes_ids_list:
nn_host = config['configurations']['hdfs-site'][format('dfs.namenode.rpc-address.{dfs_ha_nameservices}.{nn_id}')]
- if hostname in nn_host:
+ if hostname.lower() in nn_host.lower():
namenode_id = nn_id
namenode_rpc = nn_host
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc1b7ab8/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 6f63836..7a63e25 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -124,7 +124,7 @@ if dfs_ha_namenode_ids:
if dfs_ha_enabled:
for nn_id in dfs_ha_namemodes_ids_list:
nn_host = config['configurations']['hdfs-site'][format('dfs.namenode.rpc-address.{dfs_ha_nameservices}.{nn_id}')]
- if hostname in nn_host:
+ if hostname.lower() in nn_host.lower():
namenode_id = nn_id
namenode_rpc = nn_host
# With HA enabled namenode_address is recomputed
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc1b7ab8/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 2ade512..92abd57 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
@@ -290,7 +290,7 @@ if dfs_ha_namenode_ids:
if dfs_ha_enabled:
for nn_id in dfs_ha_namemodes_ids_list:
nn_host = config['configurations']['hdfs-site'][format('dfs.namenode.rpc-address.{dfs_ha_nameservices}.{nn_id}')]
- if hostname in nn_host:
+ if hostname.lower() in nn_host.lower():
namenode_id = nn_id
namenode_rpc = nn_host
pass