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/16 18:39:06 UTC
[lucene-solr] branch reference_impl_dev updated (794972d -> 6f2f98c)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 794972d @1243 Minor fixes.
new da22449 @1244 Minor fixes.
new 6f2f98c @1245 Test leak.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java | 6 +++---
solr/core/src/java/org/apache/solr/cloud/ZkCollectionTerms.java | 6 ++++++
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
[lucene-solr] 02/02: @1245 Test leak.
Posted by ma...@apache.org.
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 6f2f98cfd9aa830d9099f69dc32d99d47c632035
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Dec 16 12:38:39 2020 -0600
@1245 Test leak.
---
solr/core/src/java/org/apache/solr/cloud/ZkCollectionTerms.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkCollectionTerms.java b/solr/core/src/java/org/apache/solr/cloud/ZkCollectionTerms.java
index b5b4ef4..62f5cd6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkCollectionTerms.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkCollectionTerms.java
@@ -17,6 +17,7 @@
package org.apache.solr.cloud;
+import org.apache.solr.common.AlreadyClosedException;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.ObjectReleaseTracker;
@@ -37,6 +38,7 @@ class ZkCollectionTerms implements AutoCloseable {
private final ReentrantLock collectionToTermsLock = new ReentrantLock(true);
private final SolrZkClient zkClient;
+ private volatile boolean closed;
ZkCollectionTerms(String collection, SolrZkClient client) {
this.collection = collection;
@@ -50,6 +52,9 @@ class ZkCollectionTerms implements AutoCloseable {
try {
ZkShardTerms zkterms = null;
if (!terms.containsKey(shardId)) {
+ if (closed) {
+ throw new AlreadyClosedException();
+ }
zkterms = new ZkShardTerms(collection, shardId, zkClient);
IOUtils.closeQuietly(terms.put(shardId, zkterms));
return zkterms;
@@ -91,6 +96,7 @@ class ZkCollectionTerms implements AutoCloseable {
public void close() {
collectionToTermsLock.lock();
try {
+ closed = true;
terms.values().forEach(ZkShardTerms::close);
terms.clear();
[lucene-solr] 01/02: @1244 Minor fixes.
Posted by ma...@apache.org.
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 da22449c5ce18a08dc085a1e7e3659a65ee9308c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Dec 16 12:18:59 2020 -0600
@1244 Minor fixes.
---
solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java | 6 +++---
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 99aab47..49682e2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -344,7 +344,7 @@ public class RecoveryStrategy implements Runnable, Closeable {
while (!isClosed()) {
try {
try {
- Replica leader = zkController.getZkStateReader().getLeaderRetry(coreDescriptor.getCollectionName(), coreDescriptor.getCloudDescriptor().getShardId(), 1000);
+ Replica leader = zkController.getZkStateReader().getLeaderRetry(coreDescriptor.getCollectionName(), coreDescriptor.getCloudDescriptor().getShardId(), 5000);
if (leader != null && leader.getName().equals(coreName)) {
log.info("We are the leader, STOP recovery");
return;
@@ -392,7 +392,7 @@ public class RecoveryStrategy implements Runnable, Closeable {
CloudDescriptor cloudDesc = this.coreDescriptor.getCloudDescriptor();
Replica leaderprops;
try {
- leaderprops = zkStateReader.getLeaderRetry(cloudDesc.getCollectionName(), cloudDesc.getShardId(), 1000);
+ leaderprops = zkStateReader.getLeaderRetry(cloudDesc.getCollectionName(), cloudDesc.getShardId(), 5000);
} catch (Exception e) {
log.error("Could not get leader for {} {} {}", cloudDesc.getCollectionName(), cloudDesc.getShardId(), zkStateReader.getClusterState().getCollectionOrNull(cloudDesc.getCollectionName()), e);
throw new SolrException(ErrorCode.SERVER_ERROR, e);
@@ -572,7 +572,7 @@ public class RecoveryStrategy implements Runnable, Closeable {
while (!successfulRecovery && !isClosed()) {
try {
CloudDescriptor cloudDesc = this.coreDescriptor.getCloudDescriptor();
- final Replica leader = zkStateReader.getLeaderRetry(cloudDesc.getCollectionName(), cloudDesc.getShardId(), 1000);
+ final Replica leader = zkStateReader.getLeaderRetry(cloudDesc.getCollectionName(), cloudDesc.getShardId(), 5000);
log.info("Begin buffering updates. core=[{}]", coreName);
// recalling buffer updates will drop the old buffer tlog
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 1ef3cc5..68ae466 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -2049,7 +2049,7 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
try {
// wait for the watcher predicate to return true, or time out
- if (!latch.await(wait, unit) || isClosed()) {
+ if (!latch.await(wait, unit)) {
throw new TimeoutException("Timeout waiting to see state for collection=" + collection + " :" + "live=" + liveNodes
+ docCollection.get());
}