[lucene-solr] 03/05: @692 Update executor used for recovery.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit e21ff9c680728ce5072cdfe078c235387f63861a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 1 21:53:41 2020 -0500

    @692 Update executor used for recovery.
---
 solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index f68a56b..566c442 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -127,7 +127,7 @@ public class UpdateShardHandler implements SolrInfoBean {
 //      recoveryExecutor = ExecutorUtil.newMDCAwareFixedThreadPool(cfg.getMaxRecoveryThreads(), recoveryThreadFactory);
 //    } else {
       log.debug("Creating recoveryExecutor with unbounded pool");
-      recoveryExecutor = new ParWorkExecutor("recoveryExecutor", 100);
+      recoveryExecutor = ParWork.getRootSharedExecutor();
  //   }
   }
 
@@ -211,9 +211,6 @@ public class UpdateShardHandler implements SolrInfoBean {
 
   public void close() {
   //  closeTracker.close();
-    if (recoveryExecutor != null) {
-      recoveryExecutor.shutdownNow();
-    }
     if (updateOnlyClient != null) updateOnlyClient.disableCloseLock();
     try (ParWork closer = new ParWork(this, true)) {
       closer.collect("", () -> {
@@ -228,7 +225,6 @@ public class UpdateShardHandler implements SolrInfoBean {
         SolrInfoBean.super.close();
         return this;
       });
-      closer.collect(recoveryExecutor);
     }
     assert ObjectReleaseTracker.release(this);
   }