You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/04/03 13:08:33 UTC
[ambari] branch trunk updated: AMBARI-23074. Change the default
datadir for Infra Solr. (#863)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new eef8f14 AMBARI-23074. Change the default datadir for Infra Solr. (#863)
eef8f14 is described below
commit eef8f141d6111b5dbf2ea8ee445b2f7070a98fb3
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Tue Apr 3 15:08:31 2018 +0200
AMBARI-23074. Change the default datadir for Infra Solr. (#863)
---
.../AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml | 2 +-
.../src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 8 ++++----
ambari-server/src/test/python/stacks/2.4/configs/default.json | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml
index a616c37..2f8fc63 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml
@@ -75,7 +75,7 @@
</property>
<property>
<name>infra_solr_datadir</name>
- <value>/opt/ambari_infra_solr/data</value>
+ <value>/var/lib/ambari-infra-solr/data</value>
<display-name>Infra Solr data dir</display-name>
<description>Directory for storting Solr index. Make sure you have enough disk space</description>
<value-attributes>
diff --git a/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py b/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py
index 6dc409b..237466a 100644
--- a/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py
+++ b/ambari-server/src/test/python/stacks/2.4/AMBARI_INFRA/test_infra_solr.py
@@ -44,14 +44,14 @@ class TestInfraSolr(RMFTestCase):
cd_access = 'a',
mode = 0755
)
- self.assertResourceCalled('Directory', '/opt/ambari_infra_solr/data',
+ self.assertResourceCalled('Directory', '/var/lib/ambari-infra-solr/data',
owner = 'solr',
group = 'hadoop',
create_parents = True,
cd_access = 'a',
mode = 0755
)
- self.assertResourceCalled('Directory', '/opt/ambari_infra_solr/data/resources',
+ self.assertResourceCalled('Directory', '/var/lib/ambari-infra-solr/data/resources',
owner = 'solr',
group = 'hadoop',
create_parents = True,
@@ -87,7 +87,7 @@ class TestInfraSolr(RMFTestCase):
mode = 0755,
content = InlineTemplate(self.getConfig()['configurations']['infra-solr-env']['content'])
)
- self.assertResourceCalled('File', '/opt/ambari_infra_solr/data/solr.xml',
+ self.assertResourceCalled('File', '/var/lib/ambari-infra-solr/data/solr.xml',
owner = 'solr',
group='hadoop',
content = InlineTemplate(self.getConfig()['configurations']['infra-solr-xml']['content'])
@@ -143,7 +143,7 @@ class TestInfraSolr(RMFTestCase):
)
self.configureResourcesCalled()
- self.assertResourceCalled('Execute', "/usr/lib/ambari-infra-solr/bin/solr start -cloud -noprompt -s /opt/ambari_infra_solr/data >> /var/log/ambari-infra-solr/solr-install.log 2>&1",
+ self.assertResourceCalled('Execute', "/usr/lib/ambari-infra-solr/bin/solr start -cloud -noprompt -s /var/lib/ambari-infra-solr/data >> /var/log/ambari-infra-solr/solr-install.log 2>&1",
environment = {'SOLR_INCLUDE': '/etc/ambari-infra-solr/conf/infra-solr-env.sh'},
user = "solr"
)
diff --git a/ambari-server/src/test/python/stacks/2.4/configs/default.json b/ambari-server/src/test/python/stacks/2.4/configs/default.json
index 91af813..0e1a4b5 100644
--- a/ambari-server/src/test/python/stacks/2.4/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.4/configs/default.json
@@ -394,7 +394,7 @@
"infra_solr_znode": "/infra-solr",
"infra_solr_conf": "/etc/ambari-infra-solr",
"infra_solr_pid_dir": "/var/run/ambari-infra-solr",
- "infra_solr_datadir": "/opt/ambari_infra_solr/data",
+ "infra_solr_datadir": "/var/lib/ambari-infra-solr/data",
"infra_solr_log_dir": "/var/log/ambari-infra-solr",
"infra_solr_client_log_dir": "/var/log/ambari-infra-solr-client",
"infra_solr_jmx_port" : "1",
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.