You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/06/07 00:48:37 UTC
[2/2] lucene-solr:master: SOLR-10233: Stop warning users about
misconfigured ReplicationHandler when using replica types
SOLR-10233: Stop warning users about misconfigured ReplicationHandler when using replica types
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a03c3369
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a03c3369
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a03c3369
Branch: refs/heads/master
Commit: a03c3369e28a1c350842649726801e79285625e7
Parents: 97655b8
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Tue Jun 6 17:23:01 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Tue Jun 6 17:23:01 2017 -0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/handler/IndexFetcher.java | 2 +-
solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a03c3369/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
index 7d15701..9c9918e 100644
--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -155,7 +155,7 @@ public class IndexFetcher {
private boolean useExternalCompression = false;
- private boolean fetchFromLeader = false;
+ boolean fetchFromLeader = false;
private final HttpClient myHttpClient;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a03c3369/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index f3dcdeb..2d545ba 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -1217,7 +1217,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
NamedList master = (NamedList) initArgs.get("master");
boolean enableMaster = isEnabled( master );
- if (enableMaster || enableSlave) {
+ if (enableMaster || (enableSlave && !currentIndexFetcher.fetchFromLeader)) {
if (core.getCoreContainer().getZkController() != null) {
LOG.warn("SolrCloud is enabled for core " + core.getName() + " but so is old-style replication. Make sure you" +
" intend this behavior, it usually indicates a mis-configuration. Master setting is " +