You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/07/03 09:33:34 UTC
[1/2] lucene-solr:jira/solr-10878: SOLR-10878 Apply a patch for
SOLR-10914.
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10878 6f8039f60 -> 55d24b0eb
SOLR-10878 Apply a patch for SOLR-10914.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/207c98bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/207c98bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/207c98bc
Branch: refs/heads/jira/solr-10878
Commit: 207c98bc5778ef968db84d2c362ed1bbd162de5e
Parents: 6f8039f
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Jun 20 10:49:24 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Jun 20 10:49:24 2017 +0200
----------------------------------------------------------------------
.../org/apache/solr/cloud/RecoveryStrategy.java | 27 +++-----------------
1 file changed, 4 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/207c98bc/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 3449935..20b174f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -19,7 +19,6 @@ package org.apache.solr.cloud;
import java.io.Closeable;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.net.SocketTimeoutException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -811,29 +810,12 @@ public class RecoveryStrategy implements Runnable, Closeable {
prepCmd.setOnlyIfLeaderActive(true);
}
- final int maxTries = 30;
- for (int numTries = 0; numTries < maxTries; numTries++) {
- try {
- sendPrepRecoveryCmd(leaderBaseUrl, prepCmd);
- break;
- } catch (ExecutionException e) {
- if (e.getCause() instanceof SolrServerException) {
- SolrServerException solrException = (SolrServerException) e.getCause();
- if (solrException.getRootCause() instanceof SocketTimeoutException && numTries < maxTries) {
- LOG.warn("Socket timeout on send prep recovery cmd, retrying.. ");
- continue;
- }
- }
- throw e;
- }
- }
- }
-
- final private void sendPrepRecoveryCmd(String leaderBaseUrl, WaitForState prepCmd)
- throws SolrServerException, IOException, InterruptedException, ExecutionException {
+ int conflictWaitMs = zkController.getLeaderConflictResolveWait();
+ // timeout after 5 seconds more than the max timeout on the server side
+ int readTimeout = conflictWaitMs + 8;
try (HttpSolrClient client = new HttpSolrClient.Builder(leaderBaseUrl).build()) {
client.setConnectionTimeout(10000);
- client.setSoTimeout(10000);
+ client.setSoTimeout(readTimeout);
HttpUriRequestResponse mrr = client.httpUriRequest(prepCmd);
prevSendPreRecoveryHttpUriRequest = mrr.httpUriRequest;
@@ -842,5 +824,4 @@ public class RecoveryStrategy implements Runnable, Closeable {
mrr.future.get();
}
}
-
}
[2/2] lucene-solr:jira/solr-10878: SOLR-10878 Test also the HDFS
movereplica.
Posted by ab...@apache.org.
SOLR-10878 Test also the HDFS movereplica.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/55d24b0e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/55d24b0e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/55d24b0e
Branch: refs/heads/jira/solr-10878
Commit: 55d24b0eb3cdc85a3bbacd438fc28b22702714a3
Parents: 207c98b
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Jun 21 11:17:38 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Jun 21 11:17:38 2017 +0200
----------------------------------------------------------------------
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 53 ++++++++++++++++++++
.../org/apache/solr/cloud/MoveReplicaTest.java | 5 +-
2 files changed, 56 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55d24b0e/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java
new file mode 100644
index 0000000..884d49e
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java
@@ -0,0 +1,53 @@
+package org.apache.solr.cloud;
+
+import com.carrotsearch.randomizedtesting.ThreadFilter;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.solr.cloud.hdfs.HdfsTestUtil;
+import org.apache.solr.common.cloud.ZkConfigManager;
+import org.apache.solr.util.BadHdfsThreadsFilter;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+/**
+ *
+ */
+@ThreadLeakFilters(defaultFilters = true, filters = {
+ BadHdfsThreadsFilter.class, // hdfs currently leaks thread(s)
+ MoveReplicaHDFSTest.ForkJoinThreadsFilter.class
+})
+public class MoveReplicaHDFSTest extends MoveReplicaTest {
+
+ private static MiniDFSCluster dfsCluster;
+
+ @BeforeClass
+ public static void setupClass() throws Exception {
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
+
+ ZkConfigManager configManager = new ZkConfigManager(zkClient());
+ configManager.uploadConfigDir(configset("cloud-hdfs"), "conf1");
+
+ System.setProperty("solr.hdfs.home", HdfsTestUtil.getDataDir(dfsCluster, "data"));
+ }
+
+ @AfterClass
+ public static void teardownClass() throws Exception {
+ cluster.shutdown(); // need to close before the MiniDFSCluster
+ HdfsTestUtil.teardownClass(dfsCluster);
+ dfsCluster = null;
+ }
+
+
+ public static class ForkJoinThreadsFilter implements ThreadFilter {
+
+ @Override
+ public boolean reject(Thread t) {
+ String name = t.getName();
+ if (name.startsWith("ForkJoinPool.commonPool")) {
+ return true;
+ }
+ return false;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55d24b0e/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
index c6beb46..8f00431 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
public class MoveReplicaTest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@BeforeClass
public static void setupCluster() throws Exception {
configureCluster(4)
@@ -107,7 +108,7 @@ public class MoveReplicaTest extends SolrCloudTestCase {
boolean recovered = false;
for (int i = 0; i < 300; i++) {
DocCollection collState = getCollectionState(coll);
- log.info("###### " + collState);
+ log.debug("###### " + collState);
Collection<Replica> replicas = collState.getSlice(shardId).getReplicas();
boolean allActive = true;
boolean hasLeaders = true;
@@ -148,7 +149,7 @@ public class MoveReplicaTest extends SolrCloudTestCase {
recovered = false;
for (int i = 0; i < 300; i++) {
DocCollection collState = getCollectionState(coll);
- log.info("###### " + collState);
+ log.debug("###### " + collState);
Collection<Replica> replicas = collState.getSlice(shardId).getReplicas();
boolean allActive = true;
boolean hasLeaders = true;