You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2017/02/20 01:40:56 UTC
[1/5] lucene-solr:master: SOLR-10168: ShardSplit can fail with NPE in
OverseerCollectionMessageHandler#waitForCoreAdminAsyncCallToComplete.
Repository: lucene-solr
Updated Branches:
refs/heads/master 5fb94cee6 -> 8c1e67e30
SOLR-10168: ShardSplit can fail with NPE in OverseerCollectionMessageHandler#waitForCoreAdminAsyncCallToComplete.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/33466cb0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/33466cb0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/33466cb0
Branch: refs/heads/master
Commit: 33466cb0b70b4bcdf4763d1d4f30dd560de83e6e
Parents: 9ca3d57
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 20:07:33 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Sun Feb 19 20:38:31 2017 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../apache/solr/cloud/OverseerCollectionMessageHandler.java | 6 ++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/33466cb0/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2e9fe7c..3ccb2ce 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -165,6 +165,8 @@ Bug Fixes
* SOLR-10159: When DBQ is reordered with an in-place update, upon whose updated value the DBQ is based
on, the DBQ fails due to excessive caching in DeleteByQueryWrapper (Ishan Chattopadhyaya)
+* SOLR-10168: ShardSplit can fail with NPE in OverseerCollectionMessageHandler#waitForCoreAdminAsyncCallToComplete. (Mark Miller)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/33466cb0/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index a21f18f..00eb12d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -938,6 +938,12 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
if (srsp != null) {
NamedList results = new NamedList();
processResponse(results, srsp, Collections.emptySet());
+ if (srsp.getSolrResponse().getResponse() == null) {
+ NamedList response = new NamedList();
+ response.add("STATUS", "failed");
+ return response;
+ }
+
String r = (String) srsp.getSolrResponse().getResponse().get("STATUS");
if (r.equals("running")) {
log.debug("The task is still RUNNING, continuing to wait.");
[3/5] lucene-solr:master: tests: always use global blockcache for
chaosmonkey tests.
Posted by ma...@apache.org.
tests: always use global blockcache for chaosmonkey tests.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/06707cca
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/06707cca
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/06707cca
Branch: refs/heads/master
Commit: 06707cca6431f6b9865fedf08c72900e2b768d93
Parents: 33466cb
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 20:36:05 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Sun Feb 19 20:38:32 2017 -0500
----------------------------------------------------------------------
.../apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java | 1 +
.../org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/06707cca/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java
index 47a9b98..1da66ea 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java
@@ -40,6 +40,7 @@ public class HdfsChaosMonkeyNothingIsSafeTest extends ChaosMonkeyNothingIsSafeTe
@BeforeClass
public static void setupClass() throws Exception {
dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
+ System.setProperty("solr.hdfs.blockcache.global", "true"); // always use global cache, this test can create a lot of directories
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/06707cca/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java
index 525b62d..0bd29ac 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java
@@ -38,6 +38,7 @@ public class HdfsChaosMonkeySafeLeaderTest extends ChaosMonkeySafeLeaderTest {
@BeforeClass
public static void setupClass() throws Exception {
+ System.setProperty("solr.hdfs.blockcache.global", "true"); // always use global cache, this test can create a lot of directories
dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
}
[4/5] lucene-solr:master: SOLR-8129: Harden
HdfsChaosMonkeyNothingIsSafeTest some
Posted by ma...@apache.org.
SOLR-8129: Harden HdfsChaosMonkeyNothingIsSafeTest some
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/72f71275
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/72f71275
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/72f71275
Branch: refs/heads/master
Commit: 72f71275b28635cc4383fa12923245aaba69d592
Parents: 06707cc
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 20:37:48 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Sun Feb 19 20:38:32 2017 -0500
----------------------------------------------------------------------
.../org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/72f71275/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
index 58d52d2..4e6122e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
@@ -44,14 +44,12 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-
@Slow
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
-@ThreadLeakLingering(linger = 60000)
+//@ThreadLeakLingering(linger = 60000)
@SuppressObjectReleaseTracker(bugUrl="Testing purposes")
public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase {
- private static final int FAIL_TOLERANCE = 60;
+ private static final int FAIL_TOLERANCE = 100;
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
[2/5] lucene-solr:master: SOLR-10166: TestLBHttpSolrClient needs to
be hardened.
Posted by ma...@apache.org.
SOLR-10166: TestLBHttpSolrClient needs to be hardened.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9ca3d57b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9ca3d57b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9ca3d57b
Branch: refs/heads/master
Commit: 9ca3d57b2bfababb33c8e4d785c681140342710a
Parents: 5fb94ce
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 19:40:48 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Sun Feb 19 20:38:31 2017 -0500
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/TestLBHttpSolrClient.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ca3d57b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index 64e90c3..964ea26 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -207,8 +207,8 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
CloseableHttpClient myHttpClient = HttpClientUtil.createClient(null);
try {
LBHttpSolrClient client = getLBHttpSolrClient(myHttpClient, s);
- client.setConnectionTimeout(250);
- client.setSoTimeout(250);
+ client.setConnectionTimeout(500);
+ client.setSoTimeout(500);
client.setAliveCheckInterval(500);
// Kill a server and test again
@@ -242,6 +242,8 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
String name = resp.getResults().get(0).getFieldValue("name").toString();
if (name.equals(serverName))
return;
+
+ Thread.sleep(500);
}
}
[5/5] lucene-solr:master: SOLR-10170: ClassCastException in
RecoveryStrategy.
Posted by ma...@apache.org.
SOLR-10170: ClassCastException in RecoveryStrategy.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8c1e67e3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8c1e67e3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8c1e67e3
Branch: refs/heads/master
Commit: 8c1e67e30e071ceed636083532d4598bf6a8791f
Parents: 72f7127
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 20:38:25 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Sun Feb 19 20:38:32 2017 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/cloud/RecoveryStrategy.java | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8c1e67e3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3ccb2ce..cc3a3b2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -167,6 +167,8 @@ Bug Fixes
* SOLR-10168: ShardSplit can fail with NPE in OverseerCollectionMessageHandler#waitForCoreAdminAsyncCallToComplete. (Mark Miller)
+* SOLR-10170: ClassCastException in RecoveryStrategy. (Mark Miller)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8c1e67e3/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 02b7cbd..62d877b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -591,10 +591,12 @@ public class RecoveryStrategy extends Thread implements Closeable {
sendPrepRecoveryCmd(leaderBaseUrl, prepCmd);
break;
} catch (ExecutionException e) {
- SolrServerException solrException = (SolrServerException) e.getCause();
- if (solrException.getRootCause() instanceof SocketTimeoutException && numTries < maxTries) {
- LOG.warn("Socket timeout when send prep recovery cmd, retrying.. ");
- continue;
+ 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;
}