You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/11/26 08:02:17 UTC
svn commit: r1545554 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/SolrCore.java
core/src/java/org/apache/solr/update/PeerSync.java
Author: shalin
Date: Tue Nov 26 07:02:17 2013
New Revision: 1545554
URL: http://svn.apache.org/r1545554
Log:
SOLR-5499: Log a warning if /get is not registered when using SolrCloud
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1545554&r1=1545553&r2=1545554&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Nov 26 07:02:17 2013
@@ -177,6 +177,9 @@ Other Changes
* SOLR-5487: Replication factor error message doesn't match constraint.
(Patrick Hunt via shalin)
+* SOLR-5499: Log a warning if /get is not registered when using SolrCloud.
+ (Daniel Collins via shalin)
+
================== 4.6.0 ==================
Versions of Major Components
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1545554&r1=1545553&r2=1545554&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Tue Nov 26 07:02:17 2013
@@ -770,7 +770,7 @@ public final class SolrCore implements S
updateProcessorChains = loadUpdateProcessorChains();
reqHandlers = new RequestHandlers(this);
reqHandlers.initHandlersFromConfig(solrConfig);
-
+
// Handle things that should eventually go away
initDeprecatedSupport();
@@ -854,13 +854,21 @@ public final class SolrCore implements S
CoreContainer cc = cd.getCoreContainer();
- if (cc != null && cc.isZooKeeperAware() && Slice.CONSTRUCTION.equals(cd.getCloudDescriptor().getShardState())) {
- // set update log to buffer before publishing the core
- getUpdateHandler().getUpdateLog().bufferUpdates();
-
- cd.getCloudDescriptor().setShardState(null);
- cd.getCloudDescriptor().setShardRange(null);
- cd.getCloudDescriptor().setShardParent(null);
+ if (cc != null && cc.isZooKeeperAware()) {
+ SolrRequestHandler realtimeGetHandler = reqHandlers.get("/get");
+ if (realtimeGetHandler == null) {
+ log.warn("WARNING: RealTimeGetHandler is not registered at /get. " +
+ "SolrCloud will always use full index replication instead of the more efficient PeerSync method.");
+ }
+
+ if (Slice.CONSTRUCTION.equals(cd.getCloudDescriptor().getShardState())) {
+ // set update log to buffer before publishing the core
+ getUpdateHandler().getUpdateLog().bufferUpdates();
+
+ cd.getCloudDescriptor().setShardState(null);
+ cd.getCloudDescriptor().setShardRange(null);
+ cd.getCloudDescriptor().setShardParent(null);
+ }
}
// For debugging
// numOpens.incrementAndGet();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java?rev=1545554&r1=1545553&r2=1545554&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java Tue Nov 26 07:02:17 2013
@@ -305,7 +305,8 @@ public class PeerSync {
}
if (cantReachIsSuccess && sreq.purpose == 1 && srsp.getException() instanceof SolrException && ((SolrException) srsp.getException()).code() == 404) {
- log.warn(msg() + " got a 404 from " + srsp.getShardAddress() + ", counting as success");
+ log.warn(msg() + " got a 404 from " + srsp.getShardAddress() + ", counting as success. " +
+ "Perhaps /get is not registered?");
return true;
}
// TODO: at least log???