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/01/08 19:15:23 UTC
[06/50] [abbrv] ambari git commit: AMBARI-14542. AMS in distributed
mode fails to start with blueprint deploy. Stack advisor fix. (swagle)
AMBARI-14542. AMS in distributed mode fails to start with blueprint deploy. Stack advisor fix. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab975d3c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab975d3c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab975d3c
Branch: refs/heads/branch-dev-patch-upgrade
Commit: ab975d3c2b0673bb79b51fea0802b5eeef9a6e42
Parents: 02b5770
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Tue Jan 5 13:24:30 2016 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Tue Jan 5 13:24:30 2016 -0800
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.0.6/services/stack_advisor.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab975d3c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 5af7682..5c0e30a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -903,11 +903,13 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
hbase_zk_client_port = properties.get("hbase.zookeeper.property.clientPort")
zkPort = self.getZKPort(services)
hbase_zk_client_port_item = None
- if distributed.lower() == "true" and op_mode == "distributed" and hbase_zk_client_port != zkPort:
+ if distributed.lower() == "true" and op_mode == "distributed" and \
+ hbase_zk_client_port != zkPort and hbase_zk_client_port != "{{zookeeper_clientPort}}":
hbase_zk_client_port_item = self.getErrorItem("In AMS distributed mode, hbase.zookeeper.property.clientPort "
"should be the cluster zookeeper server port : {0}".format(zkPort))
- if distributed.lower() == "false" and op_mode == "embedded" and hbase_zk_client_port == zkPort:
+ if distributed.lower() == "false" and op_mode == "embedded" and \
+ hbase_zk_client_port == zkPort and hbase_zk_client_port != "{{zookeeper_clientPort}}":
hbase_zk_client_port_item = self.getErrorItem("In AMS embedded mode, hbase.zookeeper.property.clientPort "
"should be a different port than cluster zookeeper port."
"(default:61181)")