You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2016/07/18 11:21:21 UTC
ambari git commit: AMBARI-17766 ZOOKEEPER_SERVER START is failed
after upgrade from 2.1.1 to 2.4.0.0 and making adding ZK server (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk db7c31828 -> a12032d76
AMBARI-17766 ZOOKEEPER_SERVER START is failed after upgrade from 2.1.1 to 2.4.0.0 and making adding ZK server (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a12032d7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a12032d7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a12032d7
Branch: refs/heads/trunk
Commit: a12032d7621a770c2f283e4f75d9a9e1e4a68fc2
Parents: db7c318
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Jul 18 14:20:12 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Jul 18 14:20:22 2016 +0300
----------------------------------------------------------------------
.../resources/stacks/HDP/2.3/services/stack_advisor.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a12032d7/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 373553c..928fa95 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -256,12 +256,19 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
atlas_rest_host = atlas_server_host_info['Hosts']['host_name']
scheme = "http"
metadata_port = "21000"
+ atlas_server_default_https_port = "21443"
+ tls_enabled = "false"
if 'application-properties' in services['configurations']:
- tls_enabled = services['configurations']['application-properties']['properties']['atlas.enableTLS']
- metadata_port = services['configurations']['application-properties']['properties']['atlas.server.http.port']
+ if 'atlas.enableTLS' in services['configurations']['application-properties']['properties']:
+ tls_enabled = services['configurations']['application-properties']['properties']['atlas.enableTLS']
+ if 'atlas.server.http.port' in services['configurations']['application-properties']['properties']:
+ metadata_port = services['configurations']['application-properties']['properties']['atlas.server.http.port']
if tls_enabled.lower() == "true":
scheme = "https"
- metadata_port = services['configurations']['application-properties']['properties']['atlas.server.https.port']
+ if 'atlas.server.https.port' in services['configurations']['atlas.server.https.port']['properties']:
+ metadata_port = services['configurations']['application-properties']['properties']['atlas.server.https.port']
+ else:
+ metadata_port = atlas_server_default_https_port
putHiveSiteProperty('atlas.rest.address', '{0}://{1}:{2}'.format(scheme, atlas_rest_host, metadata_port))
else:
putHiveSitePropertyAttribute('atlas.cluster.name', 'delete', 'true')