Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17448: Audit usage of ExecutorService#submit (#2707)

Andrey Bozhko758d1d7156f8
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4602fd102c5..6f24dcfdadd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -163,6 +163,10 @@ Other Changes
* SOLR-17142: Fix Gradle build sometimes gives spurious "unreferenced license file" warnings. (Uwe Schindler)
+* SOLR-17448: Fixed inadvertent suppression of exceptions in the background tasks across the codebase. For certain
+tasks that were scheduled via ExecutorService#submit, the results of the task execution were never examined which
+led to the suppression of exceptions. (Andrey Bozhko)
+
* SOLR-11318: Introduce unit testing for AssertTool. (Eric Pugh, Jason Gerlowski)
================== 9.7.0 ==================
diff --git a/solr/benchmark/src/java/org/apache/solr/bench/Docs.java b/solr/benchmark/src/java/org/apache/solr/bench/Docs.java
index 5c3b889c7a6..d256739acae 100644
--- a/solr/benchmark/src/java/org/apache/solr/bench/Docs.java
+++ b/solr/benchmark/src/java/org/apache/solr/bench/Docs.java
@@ -107,10 +107,7 @@ public class Docs {
new SolrNamedThreadFactory("SolrJMH DocMaker"));
for (int i = 0; i < numDocs; i++) {
- executorService.submit(
- () -> {
- docs.add(Docs.this.inputDocument());
- });
+ executorService.execute(() -> docs.add(Docs.this.inputDocument()));
}
executorService.shutdown();
diff --git a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java
index 5a793448c5c..88bfc05af1f 100755
--- a/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java
+++ b/solr/benchmark/src/java/org/apache/solr/bench/MiniClusterState.java
@@ -410,7 +410,7 @@ public class MiniClusterState {
10,
TimeUnit.SECONDS);
for (int i = 0; i < docCount; i++) {
- executorService.submit(
+ executorService.execute(
new Runnable() {
final SplittableRandom threadRandom = random.split();
diff --git a/solr/core/src/java/org/apache/solr/cli/ExportTool.java b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
index 901e90e4b7d..957bd9a6df6 100644
--- a/solr/core/src/java/org/apache/solr/cli/ExportTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
@@ -539,7 +539,7 @@ public class ExportTool extends ToolBase {
CountDownLatch producerLatch = new CountDownLatch(corehandlers.size());
corehandlers.forEach(
(s, coreHandler) ->
- producerThreadpool.submit(
+ producerThreadpool.execute(
() -> {
try {
coreHandler.exportDocsFromCore();
@@ -585,7 +585,7 @@ public class ExportTool extends ToolBase {
}
private void addConsumer(CountDownLatch consumerlatch) {
- consumerThreadpool.submit(
+ consumerThreadpool.execute(
() -> {
while (true) {
SolrDocument doc;
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 1b120da532c..a1ebe69374c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -729,14 +729,16 @@ public class ZkController implements Closeable {
try {
synchronized (collectionToTerms) {
- customThreadPool.submit(
- () -> collectionToTerms.values().parallelStream().forEach(ZkCollectionTerms::close));
+ collectionToTerms
+ .values()
+ .forEach(zkCollectionTerms -> customThreadPool.execute(zkCollectionTerms::close));
}
- customThreadPool.submit(
- () ->
- replicateFromLeaders.values().parallelStream()
- .forEach(ReplicateFromLeader::stopReplication));
+ replicateFromLeaders
+ .values()
+ .forEach(
+ replicateFromLeader ->
+ customThreadPool.execute(replicateFromLeader::stopReplication));
} finally {
ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
}
@@ -750,12 +752,12 @@ public class ZkController implements Closeable {
ExecutorService customThreadPool =
ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
- customThreadPool.submit(() -> IOUtils.closeQuietly(overseerElector.getContext()));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(overseerElector.getContext()));
- customThreadPool.submit(() -> IOUtils.closeQuietly(overseer));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(overseer));
try {
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
Collection<ElectionContext> values = electionContexts.values();
synchronized (electionContexts) {
@@ -766,8 +768,8 @@ public class ZkController implements Closeable {
} finally {
sysPropsCacher.close();
- customThreadPool.submit(() -> IOUtils.closeQuietly(cloudSolrClient));
- customThreadPool.submit(() -> IOUtils.closeQuietly(cloudManager));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(cloudSolrClient));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(cloudManager));
try {
try {
@@ -2714,7 +2716,7 @@ public class ZkController implements Closeable {
final Set<Runnable> listeners = confDirectoryListeners.get(zkDir);
if (listeners != null && !listeners.isEmpty()) {
final Set<Runnable> listenersCopy = new HashSet<>(listeners);
- // run these in a separate thread because this can be long running
+ // run these in a separate thread because this can be long-running
Runnable work =
() -> {
log.debug("Running listeners for {}", zkDir);
@@ -2726,7 +2728,7 @@ public class ZkController implements Closeable {
}
}
};
- cc.getCoreZkRegisterExecutorService().submit(work);
+ cc.getCoreZkRegisterExecutorService().execute(work);
}
}
return true;
@@ -2736,7 +2738,7 @@ public class ZkController implements Closeable {
try {
Stat newStat = zkClient.exists(zkDir, watcher, true);
if (stat != null && newStat.getVersion() > stat.getVersion()) {
- // a race condition where a we missed an event fired
+ // a race condition where we missed an event fired
// so fire the event listeners
fireEventListeners(zkDir);
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
index 18424708446..b15567bf082 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
@@ -412,7 +412,7 @@ public class ZkShardTerms implements AutoCloseable {
}
}
- /** Register a watcher to the correspond ZK term node */
+ /** Register a watcher to the corresponding ZK term node */
private void registerWatcher() throws KeeperException {
Watcher watcher =
event -> {
@@ -421,6 +421,10 @@ public class ZkShardTerms implements AutoCloseable {
return;
}
retryRegisterWatcher();
+ // if term node is deleted, refresh cannot possibly succeed
+ if (Watcher.Event.EventType.NodeDeleted == event.getType()) {
+ return;
+ }
// Some events may be missed during register a watcher, so it is safer to refresh terms
// after registering watcher
refreshTerms();
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java
index b7ed4954fbf..a71a515c56d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java
@@ -215,7 +215,7 @@ public class AddReplicaCmd implements CollApiCmds.CollectionApiCommand {
runnable.run();
}
} else {
- ccc.getExecutorService().submit(runnable);
+ ccc.getExecutorService().execute(runnable);
}
return createReplicas.stream()
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java
index 6dece0e7703..3320ea0b5b7 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java
@@ -142,7 +142,7 @@ public class MaintainRoutedAliasCmd extends AliasCmd {
case ENSURE_REMOVED:
if (exists) {
ccc.getExecutorService()
- .submit(
+ .execute(
() -> {
try {
deleteTargetCollection(
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 57370af1f18..8c5b851dac5 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1068,7 +1068,7 @@ public class CoreContainer {
solrCores.markCoreAsLoading(cd);
}
if (cd.isLoadOnStartup()) {
- coreLoadExecutor.submit(
+ coreLoadExecutor.execute(
() -> {
SolrCore core;
try {
@@ -1105,7 +1105,7 @@ public class CoreContainer {
} finally {
if (asyncSolrCoreLoad) {
- coreContainerWorkExecutor.submit(
+ coreContainerWorkExecutor.execute(
() -> ExecutorUtil.shutdownAndAwaitTerminationForever(coreLoadExecutor));
} else {
ExecutorUtil.shutdownAndAwaitTerminationForever(coreLoadExecutor);
@@ -1352,10 +1352,7 @@ public class CoreContainer {
solrCores.getModifyLock().notifyAll(); // wake up the thread
}
- customThreadPool.submit(
- () -> {
- replayUpdatesExecutor.shutdownAndAwaitTermination();
- });
+ customThreadPool.execute(replayUpdatesExecutor::shutdownAndAwaitTermination);
if (metricManager != null) {
metricManager.closeReporters(SolrMetricManager.getRegistryName(SolrInfoBean.Group.node));
@@ -1381,10 +1378,7 @@ public class CoreContainer {
try {
if (coreAdminHandler != null) {
- customThreadPool.submit(
- () -> {
- coreAdminHandler.shutdown();
- });
+ customThreadPool.execute(() -> coreAdminHandler.shutdown());
}
} catch (Exception e) {
log.warn("Error shutting down CoreAdminHandler. Continuing to close CoreContainer.", e);
@@ -1399,15 +1393,12 @@ public class CoreContainer {
} finally {
try {
if (shardHandlerFactory != null) {
- customThreadPool.submit(
- () -> {
- shardHandlerFactory.close();
- });
+ customThreadPool.execute(() -> shardHandlerFactory.close());
}
} finally {
try {
if (updateShardHandler != null) {
- customThreadPool.submit(updateShardHandler::close);
+ customThreadPool.execute(updateShardHandler::close);
}
} finally {
try {
@@ -2590,7 +2581,7 @@ public class CoreContainer {
* @param r the task to run
*/
public void runAsync(Runnable r) {
- coreContainerAsyncTaskExecutor.submit(r);
+ coreContainerAsyncTaskExecutor.execute(r);
}
public static void setWeakStringInterner() {
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 354f5465ca3..da78f08fdc4 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -296,9 +296,7 @@ public class SolrCore implements SolrInfoBean, Closeable {
return packageListeners;
}
- static int boolean_query_max_clause_count = Integer.MIN_VALUE;
-
- private ExecutorService coreAsyncTaskExecutor =
+ private final ExecutorService coreAsyncTaskExecutor =
ExecutorUtil.newMDCAwareCachedThreadPool("Core Async Task");
public final SolrCore.Provider coreProvider;
@@ -3595,7 +3593,7 @@ public class SolrCore implements SolrInfoBean, Closeable {
* @param r the task to run
*/
public void runAsync(Runnable r) {
- coreAsyncTaskExecutor.submit(r);
+ coreAsyncTaskExecutor.execute(r);
}
/**
diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
index dab68b339b7..092eb697a87 100644
--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
@@ -1802,7 +1802,7 @@ public class IndexFetcher {
} finally {
cleanup();
// if cleanup succeeds . The file is downloaded fully. do an fsync
- fsyncService.submit(
+ fsyncService.execute(
() -> {
try {
file.sync();
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java b/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java
index d56dbb6506f..9f8bc79413e 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java
@@ -70,7 +70,7 @@ class PrepRecoveryOp implements CoreAdminHandler.CoreAdminOp {
CloudDescriptor cloudDescriptor;
try (SolrCore core = coreContainer.getCore(cname)) {
if (core == null)
- throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "core not found:" + cname);
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "core not found: " + cname);
collectionName = core.getCoreDescriptor().getCloudDescriptor().getCollectionName();
cloudDescriptor = core.getCoreDescriptor().getCloudDescriptor();
}
@@ -84,11 +84,15 @@ class PrepRecoveryOp implements CoreAdminHandler.CoreAdminOp {
TimeUnit.MILLISECONDS,
(n, c) -> {
if (c == null) return false;
+ if (coreContainer.isShutDown()) {
+ log.info("Not going to wait for replica to recover - Solr is shutting down");
+ return false;
+ }
try (SolrCore core = coreContainer.getCore(cname)) {
if (core == null)
throw new SolrException(
- SolrException.ErrorCode.BAD_REQUEST, "core not found:" + cname);
+ SolrException.ErrorCode.BAD_REQUEST, "core not found: " + cname);
if (onlyIfLeader != null && onlyIfLeader) {
if (!core.getCoreDescriptor().getCloudDescriptor().isLeader()) {
throw new SolrException(
@@ -158,7 +162,7 @@ class PrepRecoveryOp implements CoreAdminHandler.CoreAdminOp {
+ cname
+ ", leaderDoesNotNeedRecovery="
+ leaderDoesNotNeedRecovery
- + ", isLeader? "
+ + ", isLeader="
+ cloudDescriptor.isLeader()
+ ", live="
+ live
@@ -191,11 +195,6 @@ class PrepRecoveryOp implements CoreAdminHandler.CoreAdminOp {
}
}
- if (coreContainer.isShutDown()) {
- throw new SolrException(
- SolrException.ErrorCode.BAD_REQUEST, "Solr is shutting down");
- }
-
return false;
});
} catch (TimeoutException | InterruptedException e) {
diff --git a/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java b/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java
index d37e812a891..faf496789f8 100644
--- a/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java
+++ b/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java
@@ -41,12 +41,12 @@ import org.slf4j.LoggerFactory;
public class ZkIndexSchemaReader implements OnReconnect {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final ManagedIndexSchemaFactory managedIndexSchemaFactory;
- private SolrZkClient zkClient;
- private String managedSchemaPath;
+ private final SolrZkClient zkClient;
+ private final String managedSchemaPath;
private final String
uniqueCoreId; // used in equals impl to uniquely identify the core that we're dependent on
private SchemaWatcher schemaWatcher;
- private ZkSolrResourceLoader zkLoader;
+ private final ZkSolrResourceLoader zkLoader;
public ZkIndexSchemaReader(
ManagedIndexSchemaFactory managedIndexSchemaFactory, SolrCore solrCore) {
@@ -127,11 +127,24 @@ public class ZkIndexSchemaReader implements OnReconnect {
@Override
public void process(WatchedEvent event) {
ZkIndexSchemaReader indexSchemaReader = schemaReader;
-
if (indexSchemaReader == null) {
return; // the core for this reader has already been removed, don't process this event
}
+ try {
+ doProcess(indexSchemaReader, event);
+ } catch (Exception e) {
+ if (schemaReader == null) {
+ // the core has been removed and started shutting down while
+ // we were processing the event, so let's just log the exception
+ log.warn("", e);
+ return;
+ }
+ throw e;
+ }
+ }
+
+ private void doProcess(ZkIndexSchemaReader indexSchemaReader, WatchedEvent event) {
// session events are not change events, and do not remove the watcher
if (Event.EventType.None.equals(event.getType())) {
return;
@@ -145,6 +158,10 @@ public class ZkIndexSchemaReader implements OnReconnect {
log.warn("ZooKeeper watch triggered, but Solr cannot talk to ZK");
return;
}
+ if (e.code() == KeeperException.Code.NONODE) {
+ log.warn("ZooKeeper watch triggered, but schema does not exist in ZK - skipping update");
+ return;
+ }
log.error("", e);
throw new ZooKeeperException(ErrorCode.SERVER_ERROR, "", e);
} catch (InterruptedException e) {
@@ -215,7 +232,7 @@ public class ZkIndexSchemaReader implements OnReconnect {
// force update now as the schema may have changed while our zk session was expired
updateSchema(null, -1);
} catch (Exception exc) {
- log.error("Failed to update managed schema watcher after session expiration due to: {}", exc);
+ log.error("Failed to update managed schema watcher after session expiration due to: ", exc);
}
}
diff --git a/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java b/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
index 49708efaebc..a3a8a7c15ca 100644
--- a/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/AuditLoggerPlugin.java
@@ -134,7 +134,7 @@ public abstract class AuditLoggerPlugin implements Closeable, Runnable, SolrInfo
queue = new ArrayBlockingQueue<>(blockingQueueSize);
executorService =
ExecutorUtil.newMDCAwareFixedThreadPool(numThreads, new SolrNamedThreadFactory("audit"));
- executorService.submit(this);
+ executorService.execute(this);
}
pluginConfig.remove("class");
log.debug(
diff --git a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
index 732304af8bb..767c1ad0b77 100644
--- a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
+++ b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
@@ -373,7 +373,7 @@ public final class DefaultSolrCoreState extends SolrCoreState
// in another thread on another 'recovery' executor.
//
// avoid deadlock: we can't use the recovery executor here!
- cc.getUpdateShardHandler().getUpdateExecutor().submit(recoveryTask);
+ cc.getUpdateShardHandler().getUpdateExecutor().execute(recoveryTask);
} catch (RejectedExecutionException e) {
// fine, we are shutting down
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
index 7dd57605a9d..9a57f4d6c9d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
@@ -263,7 +263,7 @@ public class DistributedQueueTest extends SolrTestCaseJ4 {
assertTrue(System.nanoTime() - start >= TimeUnit.MILLISECONDS.toNanos(500));
// If someone adds a new matching element while we're waiting, we should return immediately.
- executor.submit(
+ executor.execute(
() -> {
try {
Thread.sleep(500);
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 7aa1ce5372e..8d3b94071d8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
@@ -393,27 +393,27 @@ public class OverseerTest extends SolrTestCaseJ4 {
ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
for (ZkController zkController : zkControllers) {
- customThreadPool.submit(zkController::close);
+ customThreadPool.execute(zkController::close);
}
for (HttpShardHandlerFactory httpShardHandlerFactory : httpShardHandlerFactorys) {
- customThreadPool.submit(httpShardHandlerFactory::close);
+ customThreadPool.execute(httpShardHandlerFactory::close);
}
for (UpdateShardHandler updateShardHandler : updateShardHandlers) {
- customThreadPool.submit(updateShardHandler::close);
+ customThreadPool.execute(updateShardHandler::close);
}
for (SolrClient solrClient : solrClients) {
- customThreadPool.submit(() -> IOUtils.closeQuietly(solrClient));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(solrClient));
}
for (ZkStateReader reader : readers) {
- customThreadPool.submit(reader::close);
+ customThreadPool.execute(reader::close);
}
for (SolrZkClient solrZkClient : zkClients) {
- customThreadPool.submit(() -> IOUtils.closeQuietly(solrZkClient));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(solrZkClient));
}
ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
@@ -422,7 +422,7 @@ public class OverseerTest extends SolrTestCaseJ4 {
ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
for (Overseer overseer : overseers) {
- customThreadPool.submit(overseer::close);
+ customThreadPool.execute(overseer::close);
}
ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
index 28b05444ca2..b84d3f49e37 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
@@ -65,7 +65,7 @@ public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
try (ZkController zkController =
new ZkController(
cc, server.getZkAddress(), 15000, cloudConfig, Collections::emptyList)) {
- threadExecutor.submit(
+ threadExecutor.execute(
() -> {
TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (!timeout.hasTimedOut()) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java
index bf870ad0eb2..0b59d5d74ab 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java
@@ -579,7 +579,7 @@ public class TestRebalanceLeaders extends SolrCloudTestCase {
for (int idx = 0; idx < jettys.size(); ++idx) {
int finalIdx = idx;
- executorService.submit(
+ executorService.execute(
() -> {
try {
cluster.startJettySolrRunner(jettys.get(finalIdx));
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
index ff892a74f00..d7f5d041ef4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
@@ -466,7 +466,7 @@ public class ZkControllerTest extends SolrCloudTestCase {
CountDownLatch done = new CountDownLatch(nThreads);
AtomicReference<Exception> exception = new AtomicReference<>();
for (int i = 0; i < nThreads; i++) {
- svc.submit(
+ svc.execute(
() -> {
int index = idx.getAndIncrement();
latch.countDown();
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java
index 6d207721dbf..20bcabbfaf7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIAsyncDistributedZkTest.java
@@ -256,7 +256,7 @@ public class CollectionsAPIAsyncDistributedZkTest extends SolrCloudTestCase {
numThreads, new SolrNamedThreadFactory("testAsyncIdRaceCondition"));
try {
for (int i = 0; i < numThreads; i++) {
- es.submit(
+ es.execute(
new Runnable() {
@Override
diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
index 710fdc20e2e..3d0d522c973 100644
--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
@@ -627,7 +627,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {
// start another thread to constantly updating the state
final AtomicReference<Exception> updateException = new AtomicReference<>();
- executorService.submit(
+ executorService.execute(
() -> {
try {
ClusterState clusterState = reader.getClusterState();
@@ -655,7 +655,6 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {
} catch (Exception e) {
updateException.set(e);
}
- return null;
});
executorService.shutdown();
diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
index 940092b9fb4..ba0e89a0804 100644
--- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
+++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
@@ -351,7 +351,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 {
final ExecutorService executor =
ExecutorUtil.newMDCAwareFixedThreadPool(
1, new SolrNamedThreadFactory("testCoreInitDeadlockMetrics"));
- executor.submit(
+ executor.execute(
() -> {
while (!created.get()) {
var metrics =
diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java
index f7d9144d812..ff8f68b7897 100644
--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java
+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribFileStore.java
@@ -302,7 +302,7 @@ public class TestDistribFileStore extends SolrCloudTestCase {
// we know these are unequal but call assert instead of fail() because it gives a better
// error message
assertEquals(
- "Failed on path " + key + " of " + description + "after attempt #" + (i + 1),
+ "Failed on path " + key + " of " + description + " after attempt #" + (i + 1),
val,
Utils.toJSONString(actual));
}
diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java
index 04423132451..7c6069f2220 100644
--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java
+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java
@@ -73,6 +73,8 @@ import org.apache.solr.filestore.TestDistribFileStore;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.schema.FieldType;
+import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.QParser;
import org.apache.solr.search.QParserPlugin;
import org.apache.solr.security.AuthorizationContext;
@@ -753,6 +755,8 @@ public class TestPackages extends SolrCloudTestCase {
String COLLECTION_NAME = "testSchemaLoadingColl";
System.setProperty("managed.schema.mutable", "true");
+ IndexSchema[] schemas = new IndexSchema[2]; // tracks schemas for a selected core
+
String FILE1 = "/schemapkg/schema-plugins.jar";
byte[] derFile = readFile("cryptokeys/pub_key512.der");
uploadKey(derFile, ClusterFileStore.KEYS_DIR + "/pub_key512.der", cluster);
@@ -769,6 +773,7 @@ public class TestPackages extends SolrCloudTestCase {
FILE2,
"gI6vYUDmSXSXmpNEeK1cwqrp4qTeVQgizGQkd8A4Prx2K8k7c5QlXbcs4lxFAAbbdXz9F4esBqTCiLMjVDHJ5Q==");
+ // upload package v1.0
PackagePayload.AddVersion add = new PackagePayload.AddVersion();
add.version = "1.0";
add.pkg = "schemapkg";
@@ -798,22 +803,23 @@ public class TestPackages extends SolrCloudTestCase {
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(COLLECTION_NAME, 2, 4);
- verifySchemaComponent(
- cluster.getSolrClient(),
- COLLECTION_NAME,
- "/schema/fieldtypes/myNewTextFieldWithAnalyzerClass",
- Map.of(
- ":fieldType:analyzer:charFilters[0]:_packageinfo_:version",
- "1.0",
- ":fieldType:analyzer:tokenizer:_packageinfo_:version",
- "1.0",
- ":fieldType:_packageinfo_:version",
- "1.0"));
+ // make note of the schema instance for one of the cores
+ SolrCore.Provider coreProvider =
+ cluster.getJettySolrRunners().stream()
+ .flatMap(
+ jetty ->
+ jetty.getCoreContainer().getAllCoreNames().stream()
+ .map(name -> new SolrCore.Provider(jetty.getCoreContainer(), name, null)))
+ .findFirst()
+ .orElseThrow();
+ coreProvider.withCore(core -> schemas[0] = core.getLatestSchema());
+
+ // upload package v2.0
add = new PackagePayload.AddVersion();
add.version = "2.0";
add.pkg = "schemapkg";
- add.files = Arrays.asList(FILE1);
+ add.files = Arrays.asList(FILE1, FILE2);
req =
new V2Request.Builder("/cluster/package")
.forceV2(true)
@@ -835,28 +841,30 @@ public class TestPackages extends SolrCloudTestCase {
":result:packages:schemapkg[1]:files[0]",
FILE1));
- verifySchemaComponent(
- cluster.getSolrClient(),
- COLLECTION_NAME,
- "/schema/fieldtypes/myNewTextFieldWithAnalyzerClass",
- Map.of(
- ":fieldType:analyzer:charFilters[0]:_packageinfo_:version",
- "2.0",
- ":fieldType:analyzer:tokenizer:_packageinfo_:version",
- "2.0",
- ":fieldType:_packageinfo_:version",
- "2.0"));
- }
+ // even though package version 2.0 uses exactly the same files
+ // as version 1.0, the core schema should still reload, and
+ // the core should be associated with a different schema instance
+ TestDistribFileStore.assertResponseValues(
+ 10,
+ () -> {
+ coreProvider.withCore(core -> schemas[1] = core.getLatestSchema());
+ return params("schemaReloaded", (schemas[0] != schemas[1]) ? "yes" : "no");
+ },
+ Map.of("schemaReloaded", "yes"));
- private void verifySchemaComponent(
- SolrClient client, String COLLECTION_NAME, String path, Map<String, Object> expected)
- throws Exception {
- SolrParams params =
- new MapSolrParams(Map.of("collection", COLLECTION_NAME, WT, JAVABIN, "meta", "true"));
+ // after the reload, the custom field type class now comes from package v2.0
+ String fieldTypeName = "myNewTextFieldWithAnalyzerClass";
+
+ FieldType fieldTypeV1 = schemas[0].getFieldTypeByName(fieldTypeName);
+ assertEquals("my.pkg.MyTextField", fieldTypeV1.getClass().getCanonicalName());
+
+ FieldType fieldTypeV2 = schemas[1].getFieldTypeByName(fieldTypeName);
+ assertEquals("my.pkg.MyTextField", fieldTypeV2.getClass().getCanonicalName());
- GenericSolrRequest req =
- new GenericSolrRequest(SolrRequest.METHOD.GET, path, params).setRequiresCollection(true);
- TestDistribFileStore.assertResponseValues(10, client, req, expected);
+ assertNotEquals(
+ "my.pkg.MyTextField classes should be from different classloaders",
+ fieldTypeV1.getClass(),
+ fieldTypeV2.getClass());
}
public static void postFileAndWait(
diff --git a/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java b/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java
index 7f187c01371..c6ec03f683e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCancellableCollector.java
@@ -118,10 +118,7 @@ public class TestCancellableCollector extends SolrTestCase {
}
private void cancelQuery(CancellableCollector cancellableCollector) {
- executor.submit(
- () -> {
- cancellableCollector.cancel();
- });
+ executor.execute(cancellableCollector::cancel);
}
public void testSearchWithoutCancellation() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
index b0642284740..47da28286ad 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
@@ -448,7 +448,7 @@ public class TestRangeQuery extends SolrTestCaseJ4 {
// Nightly: 101 threads with 4 executors is 26 waves, approximately 1300ms delay
CountDownLatch atLeastOnceCompleted = new CountDownLatch(TEST_NIGHTLY ? 30 : 1);
for (int i = 0; i < NUM_QUERIES; i++) {
- queryService.submit(
+ queryService.execute(
() -> {
try (SolrQueryRequest req = req(params)) {
core.execute(defaultHandler, req, new SolrQueryResponse());
diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
index 9a781215b8e..422feca1fa9 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java
@@ -349,7 +349,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
boolean[] threadFinished = new boolean[2];
try {
CountDownLatch starter = new CountDownLatch(1);
- executorService.submit(
+ executorService.execute(
() -> {
threadStarted[0] = true;
try {
@@ -361,7 +361,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess
threadFinished[0] = true;
});
- executorService.submit(
+ executorService.execute(
() -> {
threadStarted[1] = true;
try {
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/CollectionPropertiesZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/CollectionPropertiesZkStateReader.java
index 93ea4d9cfe3..135251ddd5a 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/CollectionPropertiesZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/CollectionPropertiesZkStateReader.java
@@ -342,7 +342,7 @@ public class CollectionPropertiesZkStateReader implements Closeable {
private void notifyPropsWatchers(String collection, Map<String, String> properties) {
try {
- collectionPropsNotifications.submit(new PropsNotification(collection, properties));
+ collectionPropsNotifications.execute(new PropsNotification(collection, properties));
} catch (RejectedExecutionException e) {
if (!closed) {
log.error("Couldn't run collection properties notifications for {}", collection, e);
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java
index ed1eaf86dd7..044500476de 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZkClient.java
@@ -1075,9 +1075,9 @@ public class SolrZkClient implements Closeable {
log.debug("Submitting job to respond to event {}", event);
try {
if (watcher instanceof ConnectionManager) {
- zkConnManagerCallbackExecutor.submit(() -> watcher.process(event));
+ zkConnManagerCallbackExecutor.execute(() -> watcher.process(event));
} else {
- zkCallbackExecutor.submit(
+ zkCallbackExecutor.execute(
() -> {
metrics.watchesFired.increment();
watcher.process(event);
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index c2f76d62de3..0604f00768f 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -790,7 +790,7 @@ public class ZkStateReader implements SolrCloseable {
try {
List<String> nodeList = zkClient.getChildren(LIVE_NODES_ZKNODE, watcher, true);
newLiveNodes = new TreeSet<>(nodeList);
- } catch (KeeperException.NoNodeException e) {
+ } catch (KeeperException.NoNodeException | AlreadyClosedException e) {
newLiveNodes = emptySortedSet();
}
lastFetchedLiveNodes.set(newLiveNodes);
@@ -1865,7 +1865,7 @@ public class ZkStateReader implements SolrCloseable {
return;
}
try {
- notifications.submit(new Notification(collection, collectionState));
+ notifications.execute(new Notification(collection, collectionState));
} catch (RejectedExecutionException e) {
if (closed == false) {
log.error("Couldn't run collection notifications for {}", collection, e);
diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
index 170cc3c2214..f77f9dac942 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -348,9 +348,9 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
ExecutorService customThreadPool =
ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
- customThreadPool.submit(() -> IOUtils.closeQuietly(controlClient));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(controlClient));
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
try {
controlJetty.stop();
@@ -362,11 +362,11 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
});
for (SolrClient client : clients) {
- customThreadPool.submit(() -> IOUtils.closeQuietly(client));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(client));
}
for (JettySolrRunner jetty : jettys) {
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
try {
jetty.stop();
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index e7aafb2ded5..568d8b7e373 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -475,7 +475,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
Replica.Type.TLOG,
((currentI % sliceCount) + 1)); // nowarn
}
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
try {
JettySolrRunner j =
@@ -517,7 +517,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
((currentI % sliceCount) + 1)); // nowarn
}
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
try {
JettySolrRunner j =
@@ -554,7 +554,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
jettyDir,
Replica.Type.PULL,
((currentI % sliceCount) + 1)); // nowarn
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
try {
JettySolrRunner j =
@@ -592,7 +592,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
new SolrNamedThreadFactory("createReplicaRequests"));
for (CollectionAdminRequest<CollectionAdminResponse> r : createReplicaRequests) {
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
CollectionAdminResponse response;
try {
@@ -612,7 +612,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
ExecutorUtil.newMDCAwareCachedThreadPool(
new SolrNamedThreadFactory("createPullReplicaRequests"));
for (CollectionAdminRequest<CollectionAdminResponse> r : createPullReplicaRequests) {
- customThreadPool.submit(
+ customThreadPool.execute(
() -> {
CollectionAdminResponse response;
try {
@@ -1981,29 +1981,21 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
ExecutorService customThreadPool =
ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("closeThreadPool"));
- customThreadPool.submit(() -> IOUtils.closeQuietly(commonCloudSolrClient));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(commonCloudSolrClient));
- customThreadPool.submit(() -> IOUtils.closeQuietly(controlClient));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(controlClient));
- customThreadPool.submit(
- () ->
- coreClients.parallelStream()
- .forEach(
- c -> {
- IOUtils.closeQuietly(c);
- }));
+ for (SolrClient client : coreClients) {
+ customThreadPool.execute(() -> IOUtils.closeQuietly(client));
+ }
- customThreadPool.submit(
- () ->
- solrClientByCollection.values().parallelStream()
- .forEach(
- c -> {
- IOUtils.closeQuietly(c);
- }));
+ for (SolrClient client : solrClientByCollection.values()) {
+ customThreadPool.execute(() -> IOUtils.closeQuietly(client));
+ }
- customThreadPool.submit(() -> IOUtils.closeQuietly(controlClientCloud));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(controlClientCloud));
- customThreadPool.submit(() -> IOUtils.closeQuietly(cloudClient));
+ customThreadPool.execute(() -> IOUtils.closeQuietly(cloudClient));
ExecutorUtil.shutdownAndAwaitTermination(customThreadPool);
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
index 36bb09e12a4..01d07877a24 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
@@ -644,7 +644,7 @@ public class ChaosMonkey {
new SolrNamedThreadFactory("ChaosMonkey"),
false);
for (JettySolrRunner jetty : jettys) {
- executor.submit(
+ executor.execute(
() -> {
try {
jetty.stop();
@@ -668,7 +668,7 @@ public class ChaosMonkey {
new SolrNamedThreadFactory("ChaosMonkey"),
false);
for (JettySolrRunner jetty : jettys) {
- executor.submit(
+ executor.execute(
() -> {
try {
jetty.start();