You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/27 05:34:51 UTC
[1/2] lucene-solr:jira/solr-11702: SOLR-11702: Pull replica should
not watch term node
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-11702 a29ed28a7 -> 96e8933c2
SOLR-11702: Pull replica should not watch term node
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5b58f06c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5b58f06c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5b58f06c
Branch: refs/heads/jira/solr-11702
Commit: 5b58f06c6ca238303d2beddb67bc60987dc69b0e
Parents: a29ed28
Author: Cao Manh Dat <da...@apache.org>
Authored: Sat Jan 27 10:36:06 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sat Jan 27 10:36:06 2018 +0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b58f06c/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 06eccd3..7898e96 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1136,7 +1136,7 @@ public class ZkController {
publish(desc, Replica.State.ACTIVE);
}
- if (isRunningInNewLIR) {
+ if (isRunningInNewLIR && replicaType != Type.PULL) {
shardTerms.addListener(new RecoveringCoreTermWatcher(core));
}
core.getCoreDescriptor().getCloudDescriptor().setHasRegistered(true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5b58f06c/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
index f8083e2..1ce8e5f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
@@ -23,25 +23,19 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
-import org.apache.solr.common.cloud.DefaultConnectionStrategy;
-import org.apache.solr.common.cloud.OnReconnect;
-import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.TimeSource;
import org.apache.solr.util.TimeOut;
-import org.apache.zookeeper.KeeperException;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
[2/2] lucene-solr:jira/solr-11702: SOLR-11702: Fix precommit
Posted by da...@apache.org.
SOLR-11702: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/96e8933c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/96e8933c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/96e8933c
Branch: refs/heads/jira/solr-11702
Commit: 96e8933c28ebf22ed8dc7f2e4d848531374a16aa
Parents: 5b58f06
Author: Cao Manh Dat <da...@apache.org>
Authored: Sat Jan 27 12:34:36 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Sat Jan 27 12:34:36 2018 +0700
----------------------------------------------------------------------
solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96e8933c/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
index 1ce8e5f..c205a50 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
@@ -26,7 +26,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;