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/09/01 22:51:51 UTC
[lucene-solr] 08/08: @684 Fix solrclient leak.
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 7774c8bcd941481033c70ae2133d65eab8f0a46a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 1 17:40:59 2020 -0500
@684 Fix solrclient leak.
---
.../java/org/apache/solr/handler/component/RealTimeGetComponent.java | 2 +-
solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
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 8af6a09..0e251e4 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
@@ -1126,7 +1126,7 @@ public class RealTimeGetComponent extends SearchComponent
try (PeerSyncWithLeader peerSync = new PeerSyncWithLeader(rb.req.getCore(), syncWithLeader, nVersions)) {
boolean success = peerSync.sync(versions).isSuccess();
rb.rsp.add("syncWithLeader", success);
- } catch (IOException e) {
+ } catch (Exception e) {
log.error("Error while closing", e);
}
}
diff --git a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java
index 70573612..e849e49 100644
--- a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java
+++ b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java
@@ -33,6 +33,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoBean;
@@ -113,6 +114,10 @@ public class PeerSyncWithLeader implements SolrMetricProducer {
return "PeerSync: core="+uhandler.core.getName()+ " url="+myURL +" ";
}
+ public void close() {
+ IOUtils.closeQuietly(clientToLeader);
+ }
+
/**
* Sync with leader
* @param startingVersions : recent versions on startup