You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2016/12/20 23:42:04 UTC

ambari git commit: AMBARI-19261 : AMS cannot start after NN HA is enabled due to hbase.rootdir pointing to Standby NN. (avijayan)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 eaa189b8e -> c0665f8c2


AMBARI-19261 : AMS cannot start after NN HA is enabled due to hbase.rootdir pointing to Standby NN. (avijayan)


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

Branch: refs/heads/branch-2.5
Commit: c0665f8c225a0c0e268e92768008c58a78f5e686
Parents: eaa189b
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Tue Dec 20 15:06:03 2016 -0800
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Tue Dec 20 15:41:38 2016 -0800

----------------------------------------------------------------------
 .../src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py  | 2 +-
 .../src/test/python/stacks/2.2/common/test_stack_advisor.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c0665f8c/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 fa61944..a98be40 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
@@ -702,7 +702,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
     putAmsHbaseSiteProperty("hbase.tmp.dir", tmpDir)
 
     if operatingMode == "distributed":
-      putAmsHbaseSiteProperty("hbase.rootdir", defaultFs + "/user/ams/hbase")
+      putAmsHbaseSiteProperty("hbase.rootdir", "/user/ams/hbase")
 
     if operatingMode == "embedded":
       if isLocalRootDir:

http://git-wip-us.apache.org/repos/asf/ambari/blob/c0665f8c/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index cad2d1d..0d89918 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -2524,7 +2524,7 @@ class TestHDP22StackAdvisor(TestCase):
     services["configurations"]['ams-site']['properties']['timeline.metrics.service.operation.mode'] = 'distributed'
     services["configurations"]["core-site"]["properties"]["fs.defaultFS"] = 'hdfs://host1:8020'
     expected['ams-hbase-site']['properties']['hbase.cluster.distributed'] = 'true'
-    expected['ams-hbase-site']['properties']['hbase.rootdir'] = 'hdfs://host1:8020/user/ams/hbase'
+    expected['ams-hbase-site']['properties']['hbase.rootdir'] = '/user/ams/hbase'
     expected['ams-hbase-site']['properties']['hbase.zookeeper.property.clientPort'] = '2181'
     expected['ams-hbase-env']['properties']['hbase_master_heapsize'] = '512'
     expected['ams-hbase-site']['properties']['dfs.client.read.shortcircuit'] = 'true'