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/24 07:36:41 UTC
[1/2] lucene-solr:jira/solr-11702: SOLR-11702: Hardness
LIRRollingUpdatesTest
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-11702 4000cb94f -> eba1602ee
SOLR-11702: Hardness LIRRollingUpdatesTest
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9c66cdf9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9c66cdf9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9c66cdf9
Branch: refs/heads/jira/solr-11702
Commit: 9c66cdf90f5659f5630250ccd98b748a2d56f169
Parents: 4000cb9
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Jan 24 10:09:55 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Jan 24 10:09:55 2018 +0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9c66cdf9/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java b/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
index df8525b..a15406e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
@@ -306,15 +306,14 @@ public class LIRRollingUpdatesTest extends SolrCloudTestCase {
addDoc(collection, 6, leaderJetty);
JettySolrRunner oldJetty = getJettyForReplica(replicaInOldMode);
oldJetty.stop();
+ waitForState("Node did not leave", collection, (liveNodes, collectionState)
+ -> liveNodes.size() == 2);
upgrade(oldJetty);
+ oldJetty.start();
getProxyForReplica(leader).reopen();
getProxyForReplica(replicaInOldMode).reopen();
- waitForState("Node did not leave", collection, (liveNodes, collectionState)
- -> liveNodes.size() == 2);
- oldJetty.start();
-
waitForState("Timeout waiting for recovering", collection, clusterShape(1, 3));
assertDocsExistInAllReplicas(Arrays.asList(replicaInNewMode, replicaInOldMode), collection, 0, 6);
[2/2] lucene-solr:jira/solr-11702: SOLR-11702: Only Expired event
will remove watcher
Posted by da...@apache.org.
SOLR-11702: Only Expired event will remove watcher
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eba1602e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eba1602e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eba1602e
Branch: refs/heads/jira/solr-11702
Commit: eba1602ee8b714253b3a0fd382f851cc038d7382
Parents: 9c66cdf
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Jan 24 14:36:20 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Jan 24 14:36:20 2018 +0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eba1602e/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
index 8418eef..328d4f5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
@@ -289,8 +289,7 @@ public class ZkShardTerms implements AutoCloseable{
watcher = event -> {
// session events are not change events, and do not remove the watcher
if (Watcher.Event.EventType.None == event.getType()) {
- if (Watcher.Event.KeeperState.Disconnected == event.getState()
- || Watcher.Event.KeeperState.Expired == event.getState()) {
+ if (Watcher.Event.KeeperState.Expired == event.getState()) {
numWatcher.compareAndSet(1, 0);
}
return;