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 2020/11/10 01:43:55 UTC
[lucene-solr] branch reference_impl_dev updated: @1127 Fix
doRecovery logic.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 4266376 @1127 Fix doRecovery logic.
4266376 is described below
commit 4266376d464d3ecc84001954b768612bbd263560
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Nov 9 19:28:22 2020 -0600
@1127 Fix doRecovery logic.
---
.../handler/component/RealTimeGetComponent.java | 5 +----
.../apache/solr/update/DefaultSolrCoreState.java | 26 ----------------------
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 51563d3..a0aced5 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -1146,10 +1146,7 @@ public class RealTimeGetComponent extends SearchComponent
rb.rsp.add("sync", success);
if (!success && rb.req.getCore().getCoreContainer().isZooKeeperAware()) {
- ParWork.getRootSharedExecutor().submit(() -> {
- rb.req.getCore().getSolrCoreState().doRecovery(rb.req.getCore().getCoreContainer(), rb.req.getCore().getCoreDescriptor());
- });
-
+ rb.req.getCore().getSolrCoreState().doRecovery(rb.req.getCore().getCoreContainer(), rb.req.getCore().getCoreDescriptor());
}
} catch (IOException e) {
log.error("Error while closing", e);
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 bc644cf..6103535 100644
--- a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
+++ b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
@@ -394,32 +394,6 @@ public final class DefaultSolrCoreState extends SolrCoreState implements Recover
// in another thread on another 'recovery' executor.
//
- try {
- if (recoveryStrat != null) {
- recoveryStrat.close();
- }
-
- if (recoveryFuture != null) {
- while (true) {
- try {
- recoveryFuture.get(1, TimeUnit.SECONDS);
- break;
- } catch (TimeoutException e) {
- if (log.isDebugEnabled()) log.debug("1 second timeout hit, waiting on recovery again if not closed");
- synchronized (this) {
- if (solrCoreStateRefCnt == 0 || core.getCoreContainer().isShutDown()) {
- break;
- }
- }
- } catch (Exception e) {
- log.error("Exception waiting for previous recovery to finish {}", e.getMessage());
- }
- }
- }
- } catch (NullPointerException e) {
- // okay
- }
-
recoveryFuture = core.getCoreContainer().getUpdateShardHandler().getRecoveryExecutor()
.submit(recoveryTask);
} catch (RejectedExecutionException e) {