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/07/19 09:35:38 UTC
[ambari] branch branch-2.7 updated: AMBARI-24278. Infra Solr:
/etc/security/limits.d folder is not exists on Suse. (#1746)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new ed35b13 AMBARI-24278. Infra Solr: /etc/security/limits.d folder is not exists on Suse. (#1746)
ed35b13 is described below
commit ed35b13b037eb20960a81978e4999994786c7b93
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Thu Jul 19 11:35:36 2018 +0200
AMBARI-24278. Infra Solr: /etc/security/limits.d folder is not exists on Suse. (#1746)
---
.../0.1.0/package/scripts/setup_infra_solr.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/setup_infra_solr.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/setup_infra_solr.py
index 479edc1..b6055ea 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/setup_infra_solr.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/setup_infra_solr.py
@@ -91,13 +91,13 @@ def setup_infra_solr(name = None):
owner=params.infra_solr_user,
group=params.user_group,
mode=0640)
-
- File(os.path.join(params.limits_conf_dir, 'infra-solr.conf'),
- owner='root',
- group='root',
- mode=0644,
- content=Template("infra-solr.conf.j2")
- )
+ if os.path.exists(params.limits_conf_dir):
+ File(os.path.join(params.limits_conf_dir, 'infra-solr.conf'),
+ owner='root',
+ group='root',
+ mode=0644,
+ content=Template("infra-solr.conf.j2")
+ )
elif name == 'client':
solr_cloud_util.setup_solr_client(params.config)