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/12/18 18:58:12 UTC
[lucene-solr] branch reference_impl_dev updated: @1248 Cleanup.
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 0a004ce @1248 Cleanup.
0a004ce is described below
commit 0a004ce068bc5ad449864465f1db8f8d74a5c3c2
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Dec 18 12:57:27 2020 -0600
@1248 Cleanup.
---
solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java | 4 ++++
.../org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
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 c786ee0..ba0dd0c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.solr.client.solrj.cloud.ShardTerms;
+import org.apache.solr.common.AlreadyClosedException;
import org.apache.solr.common.ParWork;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -335,6 +336,9 @@ public class ZkShardTerms implements Closeable {
} catch (KeeperException.BadVersionException e) {
log.info("Failed to save terms, version is not a match, retrying version={}", newTerms.getVersion());
while (this.terms.get() == null || this.terms.get() == terms) {
+ if (isClosed.get()) {
+ throw new AlreadyClosedException();
+ }
synchronized (termUpdate) {
termUpdate.wait(250);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
index 4c87a12..0b6c808 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
+import org.apache.solr.common.ParWork;
import org.apache.solr.common.cloud.CollectionStatePredicate;
import org.apache.solr.common.cloud.DocCollection;
@@ -69,7 +70,7 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
public void testWaitForStateBeforeShutDown() throws Exception {
final String col_name = "test_col";
- final ExecutorService executor = getTestExecutor();
+ final ExecutorService executor = ParWork.getRootSharedExecutor();
final MiniSolrCloudCluster cluster = new MiniSolrCloudCluster
(1, createTempDir(), buildJettyConfig("/solr"));
try {