Repository: ambari Updated Branches: refs/heads/trunk 03600fa75 -> d97f396d6
AMBARI-16932 - Atlas server start failed after Ambari upgrade due to missing solrCloudCli.sh script Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d97f396d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d97f396d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d97f396d Branch: refs/heads/trunk Commit: d97f396d65f3eed069dc2e0d6ecdeee12aad8b78 Parents: 03600fa Author: tbeerbower <tbeerbo...@hortonworks.com> Authored: Fri May 27 20:45:42 2016 -0400 Committer: tbeerbower <tbeerbo...@hortonworks.com> Committed: Fri May 27 20:45:54 2016 -0400 ---------------------------------------------------------------------- .../common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py | 2 +- .../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 3 +++ ambari-server/src/test/python/stacks/2.3/configs/default.json | 5 ++++- ambari-server/src/test/python/stacks/2.3/configs/secure.json | 5 ++++- ambari-server/src/test/python/stacks/2.5/configs/default.json | 5 ++++- 5 files changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d97f396d/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py index 6f287dc..a2d78a9 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py @@ -109,7 +109,7 @@ def metadata(type='server'): content=StaticFile('policy-store.txt') ) - if type == 'server': + if type == 'server' and params.search_backend_solr and params.has_logsearch_solr: random_num = random.random() upload_conf_set('basic_configs', random_num) http://git-wip-us.apache.org/repos/asf/ambari/blob/d97f396d/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py index 3a9c614..573857b 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py @@ -162,6 +162,9 @@ for host in atlas_hosts: id += 1 first_id = False +atlas_search_backend = default("/configurations/application-properties/atlas.graph.index.search.backend", "") +search_backend_solr = atlas_search_backend.startswith('solr') + # logsearch solr logsearch_solr_znode = default("/configurations/logsearch-solr-env/logsearch_solr_znode", None) logsearch_solr_dir = '/usr/lib/ambari-logsearch-solr' http://git-wip-us.apache.org/repos/asf/ambari/blob/d97f396d/ambari-server/src/test/python/stacks/2.3/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.json b/ambari-server/src/test/python/stacks/2.3/configs/default.json index ef04248..157fd7e 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/default.json @@ -178,7 +178,7 @@ "atlas.cluster.name" : "c2", "atlas.graph.storage.backend": "berkeleyje", "atlas.graph.storage.directory": "data/berkley", - "atlas.graph.index.search.backend": "elasticsearch", + "atlas.graph.index.search.backend": "solr5", "atlas.graph.index.search.directory": "data/es", "atlas.graph.index.search.elasticsearch.client-only": false, "atlas.graph.index.search.elasticsearch.local-mode": true, @@ -333,6 +333,9 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], + "logsearch_solr_hosts": [ + "c6401.ambari.apache.org" + ], "zookeeper_hosts": [ "c6401.ambari.apache.org" ] http://git-wip-us.apache.org/repos/asf/ambari/blob/d97f396d/ambari-server/src/test/python/stacks/2.3/configs/secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/secure.json b/ambari-server/src/test/python/stacks/2.3/configs/secure.json index 166fd6f..3ad8656 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/secure.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/secure.json @@ -169,7 +169,7 @@ "atlas.cluster.name" : "c2", "atlas.graph.storage.backend": "berkeleyje", "atlas.graph.storage.directory": "data/berkley", - "atlas.graph.index.search.backend": "elasticsearch", + "atlas.graph.index.search.backend": "solr5", "atlas.graph.index.search.directory": "data/es", "atlas.graph.index.search.elasticsearch.client-only": false, "atlas.graph.index.search.elasticsearch.local-mode": true, @@ -324,6 +324,9 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], + "logsearch_solr_hosts": [ + "c6401.ambari.apache.org" + ], "zookeeper_hosts": [ "c6401.ambari.apache.org" ] http://git-wip-us.apache.org/repos/asf/ambari/blob/d97f396d/ambari-server/src/test/python/stacks/2.5/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/configs/default.json b/ambari-server/src/test/python/stacks/2.5/configs/default.json index 0077280..0b67405 100644 --- a/ambari-server/src/test/python/stacks/2.5/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.5/configs/default.json @@ -178,7 +178,7 @@ "atlas.cluster.name" : "c2", "atlas.graph.storage.backend": "berkeleyje", "atlas.graph.storage.directory": "data/berkley", - "atlas.graph.index.search.backend": "elasticsearch", + "atlas.graph.index.search.backend": "solr5", "atlas.graph.index.search.directory": "data/es", "atlas.graph.index.search.elasticsearch.client-only": false, "atlas.graph.index.search.elasticsearch.local-mode": true, @@ -367,6 +367,9 @@ "kafka_broker_hosts": [ "c6401.ambari.apache.org" ], + "logsearch_solr_hosts": [ + "c6401.ambari.apache.org" + ], "zookeeper_hosts": [ "c6401.ambari.apache.org" ],
