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/15 02:20:38 UTC
[1/3] lucene-solr:jira/solr-11702: SOLR-11702: Hardness
ForceLeaderTest
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-11702 ca364c729 -> 6febecbf2
SOLR-11702: Hardness ForceLeaderTest
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e65896bb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e65896bb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e65896bb
Branch: refs/heads/jira/solr-11702
Commit: e65896bbe483ffc984c2927bf016b4c50ed6690d
Parents: ca364c7
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Jan 15 09:19:41 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Jan 15 09:19:41 2018 +0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/cloud/ForceLeaderTest.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e65896bb/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
index 49b243f..3b40bfb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java
@@ -185,14 +185,13 @@ public class ForceLeaderTest extends HttpPartitionTest {
log.info("Sleep and periodically wake up to check for state...");
for (int i = 0; i < 20; i++) {
ClusterState clusterState = zkController.getZkStateReader().getClusterState();
- boolean allRecoveries = true;
- for (Replica notLeader : notLeaders) {
- if (clusterState.getCollection(collectionName).getReplica(notLeader.getName()).getState() != State.RECOVERING) {
- allRecoveries = false;
- break;
+ boolean allDown = true;
+ for (Replica replica : clusterState.getCollection(collectionName).getSlice(shard).getReplicas()) {
+ if (replica.getState() != State.DOWN) {
+ allDown = false;
}
}
- if (allRecoveries && clusterState.getCollection(collectionName).getSlice(shard).getLeader() == null) {
+ if (allDown && clusterState.getCollection(collectionName).getSlice(shard).getLeader() == null) {
break;
}
Thread.sleep(1000);
[2/3] lucene-solr:jira/solr-11702: SOLR-11702:
LeaderInitiatedRecoveryOnShardRestartTest should test on old lir
Posted by da...@apache.org.
SOLR-11702: LeaderInitiatedRecoveryOnShardRestartTest should test on old lir
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4879156e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4879156e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4879156e
Branch: refs/heads/jira/solr-11702
Commit: 4879156e82c50076e26be93cad5c822ee363b6ce
Parents: e65896b
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Jan 15 09:20:14 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Jan 15 09:20:14 2018 +0700
----------------------------------------------------------------------
.../cloud/LeaderInitiatedRecoveryOnShardRestartTest.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4879156e/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
index 0bc0394..0c46689 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
import java.lang.invoke.MethodHandles;
import java.util.Map;
+import java.util.Properties;
import org.apache.lucene.util.LuceneTestCase.Nightly;
import org.apache.lucene.util.LuceneTestCase.Slow;
@@ -26,6 +27,7 @@ import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
+import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -87,7 +89,14 @@ public class LeaderInitiatedRecoveryOnShardRestartTest extends AbstractFullDistr
String testCollectionName = "all_in_lir";
String shardId = "shard1";
- createCollection(testCollectionName, "conf1", 1, 3, 1);
+ CollectionAdminRequest.createCollection(testCollectionName, "conf1", 1, 3)
+ .setCreateNodeSet("")
+ .process(cloudClient);
+ Properties oldLir = new Properties();
+ oldLir.setProperty("lirVersion", "old");
+ for (int i = 0; i < 3; i++) {
+ CollectionAdminRequest.addReplicaToShard(testCollectionName, "shard1").setProperties(oldLir).process(cloudClient);
+ }
waitForRecoveriesToFinish(testCollectionName, false);
[3/3] lucene-solr:jira/solr-11702: SOLR-11702: javadoc
Posted by da...@apache.org.
SOLR-11702: javadoc
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6febecbf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6febecbf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6febecbf
Branch: refs/heads/jira/solr-11702
Commit: 6febecbf208faf034d443da5f6cba6eea14de32d
Parents: 4879156
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Jan 15 09:20:23 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Jan 15 09:20:23 2018 +0700
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java | 1 +
.../src/java/org/apache/solr/handler/admin/CollectionsHandler.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6febecbf/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
index 63b1b5a..d5aed65 100644
--- a/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CreateCollectionCmd.java
@@ -398,6 +398,7 @@ public class CreateCollectionCmd implements Cmd {
public static void createCollectionZkNode(DistribStateManager stateManager, String collection, Map<String,String> params) {
log.debug("Check for collection zkNode:" + collection);
String collectionPath = ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection;
+ // clean up old terms node
String termsPath = ZkStateReader.COLLECTIONS_ZKNODE + "/" + collection + "/terms";
try {
if (stateManager.hasData(termsPath)) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6febecbf/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index e25e563..b54cbaf 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -1008,7 +1008,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
.filter(rep -> zkShardTerms.registered(rep.getName()))
.mapToLong(rep -> zkShardTerms.getTerm(rep.getName()))
.max();
- // and increase terms of replicas less out-of-sync
+ // increase terms of replicas less out-of-sync
if (optionalMaxTerm.isPresent()) {
liveReplicas.stream()
.filter(rep -> zkShardTerms.getTerm(rep.getName()) == optionalMaxTerm.getAsLong())