You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2021/07/13 11:04:29 UTC
[lucene-solr] branch branch_8x updated (1d87c69 -> 66b25d2)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 1d87c69 SOLR-15526 Use new cluster for each LeaderTragicEvent test (#2531)
new 38d7bc5 SOLR-15485: action post-commit review feedback (#213)
new 66b25d2 SOLR-15526: remove unused import in LeaderTragicEventTest
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 +-
.../src/test/org/apache/solr/cloud/LeaderTragicEventTest.java | 1 -
solr/core/src/test/org/apache/solr/cloud/OverseerTest.java | 10 +++++-----
3 files changed, 6 insertions(+), 7 deletions(-)
[lucene-solr] 01/02: SOLR-15485: action post-commit review feedback
(#213)
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 38d7bc50b77d37b844fcc6672f49c7f70ca56641
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Jul 13 11:23:57 2021 +0100
SOLR-15485: action post-commit review feedback (#213)
Resolved Conflicts:
gradle/validation/validate-source-patterns.gradle
---
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 +-
solr/core/src/test/org/apache/solr/cloud/OverseerTest.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 2c4ab4c..77c0346 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1138,7 +1138,7 @@ public class CoreContainer {
} finally {
try {
if (updateShardHandler != null) {
- customThreadPool.submit(() -> updateShardHandler.close());
+ customThreadPool.submit(updateShardHandler::close);
}
} finally {
try {
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
index f4b2559..88ab70a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
@@ -327,15 +327,15 @@ public class OverseerTest extends SolrTestCaseJ4 {
ExecutorService customThreadPool = ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
for (ZkController zkController : zkControllers) {
- customThreadPool.submit( () -> zkController.close());
+ customThreadPool.submit(zkController::close);
}
for (HttpShardHandlerFactory httpShardHandlerFactory : httpShardHandlerFactorys) {
- customThreadPool.submit( () -> httpShardHandlerFactory.close());
+ customThreadPool.submit(httpShardHandlerFactory::close);
}
for (UpdateShardHandler updateShardHandler : updateShardHandlers) {
- customThreadPool.submit( () -> updateShardHandler.close());
+ customThreadPool.submit(updateShardHandler::close);
}
for (SolrClient solrClient : solrClients) {
@@ -343,7 +343,7 @@ public class OverseerTest extends SolrTestCaseJ4 {
}
for (ZkStateReader reader : readers) {
- customThreadPool.submit( () -> reader.close());
+ customThreadPool.submit(reader::close);
}
for (SolrZkClient solrZkClient : zkClients) {
@@ -356,7 +356,7 @@ public class OverseerTest extends SolrTestCaseJ4 {
for (Overseer overseer : overseers) {
- customThreadPool.submit( () -> overseer.close());
+ customThreadPool.submit(overseer::close);
}
ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
[lucene-solr] 02/02: SOLR-15526: remove unused import in
LeaderTragicEventTest
Posted by cp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 66b25d258a79dd54c8095561ac5a7e84c10bca17
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Jul 13 11:40:20 2021 +0100
SOLR-15526: remove unused import in LeaderTragicEventTest
---
solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
index 948888f..a641e9b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
@@ -37,7 +37,6 @@ import org.apache.solr.util.TestInjection;
import org.hamcrest.MatcherAssert;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;