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 11:30:14 UTC
[ambari] branch trunk updated: AMBARI-23428. Log Search / Log
Feeder: Set kerberos related solr properties through java opts. (#861)
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 c5596a8 AMBARI-23428. Log Search / Log Feeder: Set kerberos related solr properties through java opts. (#861)
c5596a8 is described below
commit c5596a8c2ab086faa4d970188531128fdff392d3
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Tue Apr 3 13:30:08 2018 +0200
AMBARI-23428. Log Search / Log Feeder: Set kerberos related solr properties through java opts. (#861)
---
.../main/java/org/apache/ambari/logfeeder/output/OutputSolr.java | 9 ++++-----
.../ambari/logsearch/configurer/SolrCollectionConfigurer.java | 8 ++++----
.../LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2 | 3 ++-
.../LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 | 3 ++-
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java
index 65e653d..160085c 100644
--- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java
@@ -32,7 +32,6 @@ import org.apache.log4j.Logger;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder;
import org.apache.solr.client.solrj.response.SolrPingResponse;
import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.common.SolrException;
@@ -180,12 +179,12 @@ public class OutputSolr extends Output<LogFeederProps, InputMarker> implements C
}
private void setupSecurity() {
- String jaasFile = logFeederProps.getLogFeederSecurityConfig().getSolrJaasFile();
boolean securityEnabled = logFeederProps.getLogFeederSecurityConfig().isSolrKerberosEnabled();
if (securityEnabled) {
- System.setProperty(JAVA_SECURITY_AUTH_LOGIN_CONFIG, jaasFile);
- System.setProperty(SOLR_HTTPCLIENT_BUILDER_FACTORY, Krb5HttpClientBuilder.class.getCanonicalName());
- LOG.info("setupSecurity() called for kerberos configuration, jaas file: " + jaasFile);
+ String javaSecurityConfig = System.getProperty(JAVA_SECURITY_AUTH_LOGIN_CONFIG);
+ String solrHttpBuilderFactory = System.getProperty(SOLR_HTTPCLIENT_BUILDER_FACTORY);
+ LOG.info("setupSecurity() called for kerberos configuration, jaas file: "
+ + javaSecurityConfig + ", solr http client factory: " + solrHttpBuilderFactory);
}
}
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index 1621284..67f7363 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -133,12 +133,12 @@ public class SolrCollectionConfigurer implements Configurer {
}
private void setupSecurity() {
- String jaasFile = solrDaoBase.getSolrKerberosConfig().getJaasFile();
boolean securityEnabled = solrDaoBase.getSolrKerberosConfig().isEnabled();
if (securityEnabled) {
- System.setProperty(JAVA_SECURITY_AUTH_LOGIN_CONFIG, jaasFile);
- System.setProperty(SOLR_HTTPCLIENT_BUILDER_FACTORY, Krb5HttpClientBuilder.class.getCanonicalName());
- LOG.info("setupSecurity() called for kerberos configuration, jaas file: " + jaasFile);
+ String javaSecurityConfig = System.getProperty(JAVA_SECURITY_AUTH_LOGIN_CONFIG);
+ String solrHttpBuilderFactory = System.getProperty(SOLR_HTTPCLIENT_BUILDER_FACTORY);
+ LOG.info("setupSecurity() called for kerberos configuration, jaas file: {}, solr http client factory: {}",
+ javaSecurityConfig, solrHttpBuilderFactory);
}
}
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
index 4f91b36..b05c48c 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
@@ -42,5 +42,6 @@ export LOGFEEDER_TRUSTSTORE_TYPE={{logfeeder_truststore_type}}
{% endif %}
{% if security_enabled -%}
-export LOGFEEDER_JAVA_OPTS="{{zk_security_opts}}"
+LOGFEEDER_KERBEROS_OPTS="-Djava.security.auth.login.config=/usr/lib/ambari-logsearch-logfeeder/conf/logfeeder_jaas.conf -Dsolr.httpclient.builder.factory=org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder"
+export LOGFEEDER_JAVA_OPTS="{{zk_security_opts}} $LOGFEEDER_KERBEROS_OPTS"
{% endif %}
\ No newline at end of file
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
index 46dc880..1aa628b 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
@@ -46,5 +46,6 @@ export LOGSEARCH_TRUSTSTORE_TYPE={{logsearch_truststore_type}}
{% endif %}
{% if security_enabled -%}
-export LOGSEARCH_JAVA_OPTS="{{zk_security_opts}}"
+LOGSEARCH_KERBEROS_OPTS="-Djava.security.auth.login.config=/usr/lib/ambari-logsearch-portal/conf/logsearch_jaas.conf -Dsolr.httpclient.builder.factory=org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder"
+export LOGSEARCH_JAVA_OPTS="{{zk_security_opts}} $LOGSEARCH_KERBEROS_OPTS"
{% endif %}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.