You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2015/03/11 16:00:43 UTC
svn commit: r1665892 - in
/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr:
index/SolrIndexEditorProvider.java query/SolrQueryIndexProvider.java
Author: tommaso
Date: Wed Mar 11 15:00:42 2015
New Revision: 1665892
URL: http://svn.apache.org/r1665892
Log:
OAK-2602 - removed ping calls
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java?rev=1665892&r1=1665891&r2=1665892&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java Wed Mar 11 15:00:42 2015
@@ -69,10 +69,10 @@ public class SolrIndexEditorProvider imp
OakSolrConfiguration configuration = new OakSolrNodeStateConfiguration(nodeState);
SolrServerConfigurationProvider configurationProvider = new NodeStateSolrServerConfigurationProvider(definition.getChildNode("server").getNodeState());
SolrServer solrServer = new OakSolrServer(configurationProvider);
- editor = getEditor(configuration, solrServer, callback, definition);
+ editor = getEditor(configuration, solrServer, callback);
} else { // otherwise use the default configuration providers (e.g. defined via code or OSGi)
OakSolrConfiguration configuration = oakSolrConfigurationProvider.getConfiguration();
- editor = getEditor(configuration, solrServerProvider.getIndexingSolrServer(), callback, definition);
+ editor = getEditor(configuration, solrServerProvider.getIndexingSolrServer(), callback);
}
} catch (Exception e) {
log.warn("could not get Solr index editor from {}", definition.getNodeState(), e);
@@ -86,16 +86,14 @@ public class SolrIndexEditorProvider imp
}
private SolrIndexEditor getEditor(OakSolrConfiguration configuration, SolrServer solrServer,
- IndexUpdateCallback callback, NodeBuilder definition) {
+ IndexUpdateCallback callback) {
SolrIndexEditor editor = null;
try {
- if (solrServer != null && 0 == solrServer.ping().getStatus()) {
- editor = new SolrIndexEditor(
- solrServer,
- configuration, callback);
+ if (solrServer != null) {
+ editor = new SolrIndexEditor(solrServer, configuration, callback);
} else {
if (log.isWarnEnabled()) {
- log.warn("no SolrServer provided, cannot index {}", definition);
+ log.warn("no SolrServer provided, cannot perform indexing");
}
}
} catch (Exception e) {
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java?rev=1665892&r1=1665891&r2=1665892&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java Wed Mar 11 15:00:42 2015
@@ -106,8 +106,7 @@ public class SolrQueryIndexProvider impl
private void addQueryIndex(List<QueryIndex> tempIndexes, String name, SolrServer solrServer, OakSolrConfiguration configuration, NodeState definition) {
try {
- // the query engine should be returned only if the server is alive, otherwise other indexes should be used
- if (solrServer != null && 0 == solrServer.ping().getStatus()) {
+ if (solrServer != null) {
LMSEstimator estimator;
synchronized (estimators) {
estimator = estimators.get(definition);
@@ -123,7 +122,7 @@ public class SolrQueryIndexProvider impl
aggregator, estimator));
} else {
if (log.isWarnEnabled()) {
- log.warn("cannot create Solr query index as SolrServer {}Â is unreachable", solrServer);
+ log.warn("cannot create Solr query index as SolrServer is null");
}
}
} catch (Exception e) {