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/16 15:27:08 UTC
[lucene-solr] 02/02: @1227 Tweak core state locking.
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
commit a96f7e6e9a03626bdd5aecb3fd55824bdb39151b
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Nov 16 09:25:21 2020 -0600
@1227 Tweak core state locking.
---
solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 f983feb..b356eed 100644
--- a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
+++ b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
@@ -62,7 +62,7 @@ public final class DefaultSolrCoreState extends SolrCoreState implements Recover
// Use the readLock to retrieve the current IndexWriter (may be lazily opened)
// Use the writeLock for changing index writers
- private final ReentrantReadWriteLock iwLock = new ReentrantReadWriteLock();
+ private final ReentrantReadWriteLock iwLock = new ReentrantReadWriteLock(true);
private volatile SolrIndexWriter indexWriter = null;
private final DirectoryFactory directoryFactory;
@@ -313,14 +313,14 @@ public final class DefaultSolrCoreState extends SolrCoreState implements Recover
}
@Override
- public synchronized void doRecovery(CoreContainer cc, CoreDescriptor cd) {
+ public void doRecovery(CoreContainer cc, CoreDescriptor cd) {
try (SolrCore core = cc.getCore(cd.getName())) {
doRecovery(core);
}
}
@Override
- public synchronized void doRecovery(SolrCore core) {
+ public void doRecovery(SolrCore core) {
if (prepForClose || core.getCoreContainer().isShutDown() || closed) {
return;
}