You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ab...@apache.org on 2018/09/27 05:35:02 UTC
ranger git commit: RANGER-2196:Ensure that any explicit threads used
by Ranger are marked as daemon threads
Repository: ranger
Updated Branches:
refs/heads/ranger-0.7 d533e10af -> ca2e13bb5
RANGER-2196:Ensure that any explicit threads used by Ranger are marked as daemon threads
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/ca2e13bb
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/ca2e13bb
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/ca2e13bb
Branch: refs/heads/ranger-0.7
Commit: ca2e13bb5b6a2ca2021f47f09cb387e8e7b2d2be
Parents: d533e10
Author: Abhay Kulkarni <ak...@hortonworks.com>
Authored: Wed Aug 22 17:38:46 2018 -0700
Committer: Abhay Kulkarni <ak...@hortonworks.com>
Committed: Wed Sep 26 22:19:56 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java | 2 ++
.../apache/ranger/plugin/policyengine/RangerPolicyRepository.java | 3 +++
.../java/org/apache/ranger/plugin/util/RangerResourceTrie.java | 1 +
.../main/java/org/apache/ranger/biz/RangerPolicyRetriever.java | 1 +
.../src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java | 1 +
.../apache/ranger/authentication/UnixAuthenticationService.java | 2 ++
6 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/ca2e13bb/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
----------------------------------------------------------------------
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
index 56a24ed..6011dbc 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java
@@ -144,6 +144,8 @@ public class LocalFileLogBuffer<T> implements LogBuffer<T> {
mDispatcherThread = new DestinationDispatcherThread<T>(this, destination, mLogger);
+ mDispatcherThread.setDaemon(true);
+
mDispatcherThread.start();
mLogger.debug("<== LocalFileLogBuffer.start()");
http://git-wip-us.apache.org/repos/asf/ranger/blob/ca2e13bb/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
index 78d68ad..a41e08f 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
@@ -582,6 +582,9 @@ class RangerPolicyRepository {
}
}
}
+ if (LOG.isInfoEnabled()) {
+ LOG.info("This policy engine contains " + (policyEvaluators.size()+dataMaskPolicyEvaluators.size()+rowFilterPolicyEvaluators.size()) + " policy evaluators");
+ }
RangerPolicyEvaluator.PolicyEvalOrderComparator comparator = new RangerPolicyEvaluator.PolicyEvalOrderComparator();
Collections.sort(policyEvaluators, comparator);
this.policyEvaluators = Collections.unmodifiableList(policyEvaluators);
http://git-wip-us.apache.org/repos/asf/ranger/blob/ca2e13bb/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java
index 506a7e1..e6b647e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java
@@ -164,6 +164,7 @@ public class RangerResourceTrie<T extends RangerPolicyResourceEvaluator> {
builderThreads = new ArrayList<>();
for (int i = 0; i < builderThreadCount; i++) {
ResourceTrieBuilderThread t = new ResourceTrieBuilderThread(isOptimizedForRetrieval);
+ t.setDaemon(true);
builderThreads.add(t);
t.start();
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/ca2e13bb/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
index 7d1e15b..354ab1c 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerPolicyRetriever.java
@@ -174,6 +174,7 @@ public class RangerPolicyRetriever {
}
PolicyLoaderThread t = new PolicyLoaderThread(txTemplate, xService);
+ t.setDaemon(true);
t.start();
try {
t.join();
http://git-wip-us.apache.org/repos/asf/ranger/blob/ca2e13bb/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
index 27856ae..53683ec 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerTagDBRetriever.java
@@ -96,6 +96,7 @@ public class RangerTagDBRetriever {
}
TagLoaderThread t = new TagLoaderThread(txTemplate, xService);
+ t.setDaemon(true);
t.start();
try {
t.join();
http://git-wip-us.apache.org/repos/asf/ranger/blob/ca2e13bb/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
----------------------------------------------------------------------
diff --git a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
index 3b018de..08b747c 100644
--- a/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
+++ b/unixauthservice/src/main/java/org/apache/ranger/authentication/UnixAuthenticationService.java
@@ -137,6 +137,8 @@ public class UnixAuthenticationService {
UserGroupSync syncProc = new UserGroupSync();
Thread newSyncProcThread = new Thread(syncProc);
newSyncProcThread.setName("UnixUserSyncThread");
+ // If this thread is set as daemon, then the entire process will terminate if enableUnixAuth is false
+ // Therefore this is marked as non-daemon thread. Don't change the following line
newSyncProcThread.setDaemon(false);
newSyncProcThread.start();
}