Repository: ambari Updated Branches: refs/heads/branch-2.6 8e35277c2 -> 3a68e5140
AMBARI-22523. Service config changes on hdp + hdf cluster throws Consistency check failed. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a68e514 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a68e514 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a68e514 Branch: refs/heads/branch-2.6 Commit: 3a68e514035c0f1745f5ed713274f6d5292200a0 Parents: 8e35277 Author: Myroslav Papirkovskyi <[email protected]> Authored: Mon Nov 20 17:19:12 2017 +0200 Committer: Myroslav Papirkovskyi <[email protected]> Committed: Tue Nov 28 18:29:50 2017 +0200 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.6/services/stack_advisor.py | 3 +++ .../test/python/stacks/2.6/common/test_stack_advisor.py | 11 +++++++++++ 2 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3a68e514/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py index a5f54a3..0c6c2c7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py @@ -692,6 +692,9 @@ class HDP26StackAdvisor(HDP25StackAdvisor): else: druid_broker_host_port = "localhost:8083" + druid_metadata_uri = "" + druid_metadata_user = "" + druid_metadata_type = "" if 'druid-common' in services['configurations']: druid_metadata_uri = services['configurations']['druid-common']['properties']['druid.metadata.storage.connector.connectURI'] druid_metadata_type = services['configurations']['druid-common']['properties']['druid.metadata.storage.type'] http://git-wip-us.apache.org/repos/asf/ambari/blob/3a68e514/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py index f4c5508..b112ffb 100644 --- a/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py @@ -1949,6 +1949,17 @@ class TestHDP26StackAdvisor(TestCase): self.stackAdvisor.recommendHIVEConfigurations(recommendedConfigurations, clusterData, services, hosts) self.assertEquals(recommendedConfigurations, expected) + # case there are not druid-common configs present + del services['configurations']['druid-common'] + expected['hive-interactive-site']['properties']['hive.druid.broker.address.default'] = 'c6401.ambari.apache.org:8083' + expected['hive-interactive-site']['properties']['hive.druid.metadata.uri'] = '' + expected['hive-interactive-site']['properties']['hive.druid.metadata.username'] = '' + expected['hive-interactive-site']['properties']['hive.druid.metadata.db.type'] = '' + + recommendedConfigurations = {} + self.stackAdvisor.recommendHIVEConfigurations(recommendedConfigurations, clusterData, services, hosts) + self.assertEquals(recommendedConfigurations, expected) + def test_recommendHBASEConfigurations(self): configurations = {
