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/28 15:36:43 UTC
[1/3] lucene-solr:branch_6x: tests: raise timeout
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 55ddb5f27 -> 203147896
tests: raise timeout
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c7d40f7a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c7d40f7a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c7d40f7a
Branch: refs/heads/branch_6x
Commit: c7d40f7ad797ea0cb149136c11d527d0a9187c83
Parents: 55ddb5f
Author: markrmiller <ma...@apache.org>
Authored: Mon Feb 27 22:51:02 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Tue Feb 28 10:24:32 2017 -0500
----------------------------------------------------------------------
.../src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c7d40f7a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
index 9136d73..b107cbd 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -812,7 +812,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
}
threadpool.shutdown();
- assertTrue("Thread pool didn't terminate within 10 secs", threadpool.awaitTermination(10, TimeUnit.SECONDS));
+ assertTrue("Thread pool didn't terminate within 10 secs", threadpool.awaitTermination(15, TimeUnit.SECONDS));
commit();
[3/3] lucene-solr:branch_6x: SOLR-10196:
ElectionContext#runLeaderProcess can hit NPE on core close.
Posted by ma...@apache.org.
SOLR-10196: ElectionContext#runLeaderProcess can hit NPE on core close.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/20314789
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/20314789
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/20314789
Branch: refs/heads/branch_6x
Commit: 203147896c275ba286ba667950c280037a34a0d0
Parents: 33e1668
Author: markrmiller <ma...@apache.org>
Authored: Mon Feb 27 23:41:30 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Tue Feb 28 10:25:05 2017 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../core/src/java/org/apache/solr/cloud/ElectionContext.java | 8 ++++++--
.../src/test/org/apache/solr/cloud/CleanupOldIndexTest.java | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/20314789/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 429cb2d..648b300 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -128,6 +128,8 @@ Bug Fixes
* SOLR-10055: Linux installer now renames existing bin/solr.in.* as bin/solr.in.*.orig to make the installed config in
/etc/defaults be the one found by default when launching solr manually. (janhoy)
+* SOLR-10196: ElectionContext#runLeaderProcess can hit NPE on core close. (Mark Miller)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/20314789/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
index 6c073b9..ff6fb30 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
@@ -423,8 +423,12 @@ final class ShardLeaderElectionContext extends ShardLeaderElectionContextBase {
super.runLeaderProcess(weAreReplacement, 0);
try (SolrCore core = cc.getCore(coreName)) {
- core.getCoreDescriptor().getCloudDescriptor().setLeader(true);
- publishActiveIfRegisteredAndNotActive(core);
+ if (core != null) {
+ core.getCoreDescriptor().getCloudDescriptor().setLeader(true);
+ publishActiveIfRegisteredAndNotActive(core);
+ } else {
+ return;
+ }
}
log.info("I am the new leader: " + ZkCoreNodeProps.getCoreUrl(leaderProps) + " " + shardId);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/20314789/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
index cc03a25..547de8d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
@@ -47,7 +47,7 @@ public class CleanupOldIndexTest extends SolrCloudTestCase {
}
@AfterClass
- public static void teardownTestCases() throws Exception {
+ public static void afterClass() throws Exception {
if (suiteFailureMarker.wasSuccessful()) {
zkClient().printLayoutToStdOut();
[2/3] lucene-solr:branch_6x: SOLR-10207: Harden CleanupOldIndexTest.
Posted by ma...@apache.org.
SOLR-10207: Harden CleanupOldIndexTest.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/33e1668a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/33e1668a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/33e1668a
Branch: refs/heads/branch_6x
Commit: 33e1668a2055621cf039a6c6c2cbf9cfc4a71893
Parents: c7d40f7
Author: markrmiller <ma...@apache.org>
Authored: Mon Feb 27 22:55:10 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Tue Feb 28 10:24:50 2017 -0500
----------------------------------------------------------------------
.../apache/solr/cloud/CleanupOldIndexTest.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/33e1668a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
index 006c3c9..cc03a25 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java
@@ -30,6 +30,7 @@ import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.SnapShooter;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,6 +45,15 @@ public class CleanupOldIndexTest extends SolrCloudTestCase {
.addConfig("conf1", TEST_PATH().resolve("configsets").resolve("cloud-dynamic").resolve("conf"))
.configure();
}
+
+ @AfterClass
+ public static void teardownTestCases() throws Exception {
+
+ if (suiteFailureMarker.wasSuccessful()) {
+ zkClient().printLayoutToStdOut();
+ }
+
+ }
private static final String COLLECTION = "oldindextest";
@@ -54,14 +64,14 @@ public class CleanupOldIndexTest extends SolrCloudTestCase {
.processAndWait(cluster.getSolrClient(), DEFAULT_TIMEOUT);
cluster.getSolrClient().setDefaultCollection(COLLECTION); // TODO make this configurable on StoppableIndexingThread
- int[] maxDocList = new int[] {300, 700, 1200};
+ int[] maxDocList = new int[] {300, 500, 700};
int maxDoc = maxDocList[random().nextInt(maxDocList.length - 1)];
StoppableIndexingThread indexThread = new StoppableIndexingThread(null, cluster.getSolrClient(), "1", true, maxDoc, 1, true);
indexThread.start();
// give some time to index...
- int[] waitTimes = new int[] {200, 2000, 3000};
+ int[] waitTimes = new int[] {3000, 4000};
Thread.sleep(waitTimes[random().nextInt(waitTimes.length - 1)]);
// create some "old" index directories
@@ -86,13 +96,13 @@ public class CleanupOldIndexTest extends SolrCloudTestCase {
assertTrue(oldIndexDir2.isDirectory());
// bring shard replica down
- jetty.stop();
+ ChaosMonkey.stop(jetty);
// wait a moment - lets allow some docs to be indexed so replication time is non 0
Thread.sleep(waitTimes[random().nextInt(waitTimes.length - 1)]);
// bring shard replica up
- jetty.start();
+ ChaosMonkey.start(jetty);
// make sure replication can start
Thread.sleep(3000);