You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2020/12/01 22:27:22 UTC
[ranger] branch ranger-2.2 updated: RANGER-2991:Ranger should close
solrclient connection
This is an automated email from the ASF dual-hosted git repository.
rmani pushed a commit to branch ranger-2.2
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.2 by this push:
new 68e4ee2 RANGER-2991:Ranger should close solrclient connection
68e4ee2 is described below
commit 68e4ee217d461d52a3e1f9ad0ed919219203076c
Author: Ramesh Mani <rm...@cloudera.com>
AuthorDate: Wed Sep 9 11:47:32 2020 -0700
RANGER-2991:Ranger should close solrclient connection
---
.../ranger/audit/destination/SolrAuditDestination.java | 11 ++++++++++-
.../ranger/audit/provider/solr/SolrAuditProvider.java | 13 +++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
index 7631e58..cf0ba77 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
@@ -94,8 +94,17 @@ public class SolrAuditDestination extends AuditDestination {
@Override
public void stop() {
- super.stop();
+ LOG.info("SolrAuditDestination.stop() called..");
logStatus();
+ try {
+ if (solrClient != null) {
+ solrClient.close();
+ }
+ } catch (IOException ioe) {
+ LOG.error("Error while stopping slor!", ioe);
+ } finally {
+ solrClient = null;
+ }
}
synchronized void connect() {
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
index dac006c..1ef115a 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java
@@ -19,6 +19,7 @@
package org.apache.ranger.audit.provider.solr;
+import java.io.IOException;
import java.security.PrivilegedExceptionAction;
import java.util.Collection;
import java.util.Collections;
@@ -229,8 +230,16 @@ public class SolrAuditProvider extends AuditDestination {
*/
@Override
public void stop() {
- // TODO Auto-generated method stub
-
+ LOG.info("SolrAuditProvider.stop() called..");
+ try {
+ if (solrClient != null) {
+ solrClient.close();
+ }
+ } catch (IOException ioe) {
+ LOG.error("Error while stopping slor!", ioe);
+ } finally {
+ solrClient = null;
+ }
}
/*