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 2017/06/21 10:03:16 UTC
ambari git commit: AMBARI-21277. ADDENDUM part 2: Fail to create solr
clients in Log Search / Log Feeder (oleewere)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 c95ce6caa -> 992104de8
AMBARI-21277. ADDENDUM part 2: Fail to create solr clients in Log Search / Log Feeder (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/992104de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/992104de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/992104de
Branch: refs/heads/branch-2.5
Commit: 992104de8434db38866e1309950bf7c40dce3100
Parents: c95ce6c
Author: oleewere <ol...@gmail.com>
Authored: Wed Jun 21 12:02:32 2017 +0200
Committer: oleewere <ol...@gmail.com>
Committed: Wed Jun 21 12:02:37 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/ambari/logfeeder/output/OutputSolr.java | 4 +++-
.../ambari/logsearch/configurer/SolrCollectionConfigurer.java | 4 +++-
.../java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java | 4 +++-
.../apache/ambari/logsearch/handler/CreateCollectionHandler.java | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/992104de/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/output/OutputSolr.java
----------------------------------------------------------------------
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 7103905..d37c388 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
@@ -51,6 +51,8 @@ import org.apache.solr.client.solrj.response.SolrPingResponse;
import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.SolrParams;
public class OutputSolr extends Output {
private static final Logger LOG = Logger.getLogger(OutputSolr.class);
@@ -181,7 +183,7 @@ public class OutputSolr extends Output {
LOG.info("Using collection=" + collection);
setupSecurity();
SystemDefaultHttpClient httpClient = new SystemDefaultHttpClient();
- HttpClientUtil.configureClient(httpClient, null);
+ HttpClientUtil.configureClient(httpClient, new ModifiableSolrParams((SolrParams) null));
CloudSolrClient solrClient = new CloudSolrClient(zkConnectString, httpClient);
solrClient.setDefaultCollection(collection);
return solrClient;
http://git-wip-us.apache.org/repos/asf/ambari/blob/992104de/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index 906cfed..aba059d 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -34,6 +34,8 @@ import org.apache.http.impl.client.SystemDefaultHttpClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.Krb5HttpClientConfigurer;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.SolrParams;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooKeeper;
@@ -127,7 +129,7 @@ public class SolrCollectionConfigurer implements SolrConfigurer {
private CloudSolrClient createClient(String solrUrl, String zookeeperConnectString, String defaultCollection) {
if (StringUtils.isNotEmpty(zookeeperConnectString)) {
DefaultHttpClient httpClient = new SystemDefaultHttpClient();
- HttpClientUtil.configureClient(httpClient, null);
+ HttpClientUtil.configureClient(httpClient, new ModifiableSolrParams((SolrParams) null));
CloudSolrClient cloudSolrClient = new CloudSolrClient(zookeeperConnectString, httpClient);
cloudSolrClient.setDefaultCollection(defaultCollection);
return cloudSolrClient;
http://git-wip-us.apache.org/repos/asf/ambari/blob/992104de/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java
index 26f90e3..3124f35 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrSchemaFieldDao.java
@@ -40,6 +40,8 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.JavaBinCodec;
import org.apache.solr.common.util.NamedList;
import org.codehaus.jettison.json.JSONObject;
@@ -142,7 +144,7 @@ public class SolrSchemaFieldDao {
for (Replica replica : slice.getReplicas()) {
HttpEntity httpEntity = null;
try(SystemDefaultHttpClient httpClient = new SystemDefaultHttpClient()) {
- HttpClientUtil.configureClient(httpClient, null);
+ HttpClientUtil.configureClient(httpClient, new ModifiableSolrParams((SolrParams) null));
HttpGet request = new HttpGet(replica.getCoreUrl() + LUKE_REQUEST_URL_SUFFIX);
HttpResponse response = httpClient.execute(request);
httpEntity = response.getEntity();
http://git-wip-us.apache.org/repos/asf/ambari/blob/992104de/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/handler/CreateCollectionHandler.java
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/handler/CreateCollectionHandler.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/handler/CreateCollectionHandler.java
index b7743b1..9ffe16d 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/handler/CreateCollectionHandler.java
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/handler/CreateCollectionHandler.java
@@ -32,6 +32,8 @@ import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.SolrParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -172,7 +174,7 @@ public class CreateCollectionHandler implements SolrZkRequestHandler<Boolean> {
String baseUrl = getRandomBaseUrl(slices);
if (baseUrl != null) {
SystemDefaultHttpClient httpClient = new SystemDefaultHttpClient();
- HttpClientUtil.configureClient(httpClient, null);
+ HttpClientUtil.configureClient(httpClient, new ModifiableSolrParams((SolrParams) null));
HttpGet request = new HttpGet(baseUrl + String.format(MODIFY_COLLECTION_QUERY,
solrPropsConfig.getCollection(), MAX_SHARDS_PER_NODE, calculateMaxShardsPerNode(solrPropsConfig)));
HttpResponse response = httpClient.execute(request);