You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by st...@apache.org on 2016/12/22 17:27:18 UTC
ambari git commit: AMBARI-19278. Typo in the PostgreSQL database name
for druid service. (Slim Bouguerra via stoader)
Repository: ambari
Updated Branches:
refs/heads/trunk bc1b7ab8c -> c695e50a7
AMBARI-19278. Typo in the PostgreSQL database name for druid service. (Slim Bouguerra via stoader)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c695e50a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c695e50a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c695e50a
Branch: refs/heads/trunk
Commit: c695e50a71eb6afa2f4fbc4ed2ee65da8f276aed
Parents: bc1b7ab
Author: Slim Bouguerra <sb...@hortonworks.com>
Authored: Thu Dec 22 17:37:20 2016 +0100
Committer: Toader, Sebastian <st...@hortonworks.com>
Committed: Thu Dec 22 18:26:55 2016 +0100
----------------------------------------------------------------------
.../common-services/DRUID/0.9.2/configuration/druid-common.xml | 4 ++--
.../src/main/resources/stacks/HDP/2.6/services/stack_advisor.py | 4 ++--
.../src/test/python/stacks/2.6/common/test_stack_advisor.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c695e50a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
index 39ede45..0ded5d6 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml
@@ -154,8 +154,8 @@
<label>DERBY</label>
</entry>
<entry>
- <value>postgres</value>
- <label>POSTGRES</label>
+ <value>postgresql</value>
+ <label>POSTGRESQL</label>
</entry>
</entries>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c695e50a/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 ee56899..c9c590d 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
@@ -84,7 +84,7 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
metadata_storage_port = "3306"
extensions_load_list = self.addToList(extensions_load_list, mysql_module_name)
- if database_type == 'postgres':
+ if database_type == 'postgresql':
extensions_load_list = self.addToList(extensions_load_list, postgres_module_name)
metadata_storage_port = "5432"
@@ -127,7 +127,7 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
driverDict = {
'mysql': 'jdbc:mysql://{0}:{2}/{1}?createDatabaseIfNotExist=true',
'derby': 'jdbc:derby://{0}:{2}/{1};create=true',
- 'postgres': 'jdbc:postgresql://{0}:{2}/{1}'
+ 'postgresql': 'jdbc:postgresql://{0}:{2}/{1}'
}
return driverDict.get(database_type.lower())
http://git-wip-us.apache.org/repos/asf/ambari/blob/c695e50a/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 c06bebb..de0b00f 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
@@ -279,7 +279,7 @@ class TestHDP26StackAdvisor(TestCase):
"properties": {
"database_name": "druid",
"metastore_hostname": "c6401.ambari.apache.org",
- "druid.metadata.storage.type": "postgres",
+ "druid.metadata.storage.type": "postgresql",
"druid.extensions.loadList": "[\"mysql-metadata-storage\"]",
"druid.extensions.pullList": "[]"
}