RANGER-1155: potential performance/correctness issues uncovered by static code analysis
Signed-off-by: Madhan Neethiraj <[email protected]> (cherry picked from commit bf3f095429b0027213c6e10dd6a32d94608623d3) Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/543bfe04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/543bfe04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/543bfe04 Branch: refs/heads/ranger-0.6 Commit: 543bfe04ba37bae689e7e5930b1daf3f097dc5e5 Parents: efe49a8 Author: Abhay Kulkarni <[email protected]> Authored: Thu Aug 18 16:15:38 2016 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Sep 15 12:19:24 2016 -0700 ---------------------------------------------------------------------- .../ranger/plugin/policyengine/RangerPolicyRepository.java | 2 +- .../org/apache/ranger/plugin/service/RangerBasePlugin.java | 2 +- .../ranger/policyengine/RangerPolicyenginePerfTester.java | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/543bfe04/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 0012329..40fe8b6 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 @@ -51,7 +51,7 @@ class RangerPolicyRepository { AUDIT_ALL, AUDIT_NONE, AUDIT_DEFAULT } - class AuditInfo { + static private final class AuditInfo { final boolean isAudited; final long auditPolicyId; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/543bfe04/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java index 760c4a3..760fab7 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java @@ -447,7 +447,7 @@ public class RangerBasePlugin { int counter=0; } - private class PolicyEngineRefresher extends TimerTask { + static private final class PolicyEngineRefresher extends TimerTask { private final RangerBasePlugin plugin; PolicyEngineRefresher(RangerBasePlugin plugin) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/543bfe04/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPolicyenginePerfTester.java ---------------------------------------------------------------------- diff --git a/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPolicyenginePerfTester.java b/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPolicyenginePerfTester.java index 50432f7..03ea6d0 100644 --- a/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPolicyenginePerfTester.java +++ b/ranger-tools/src/main/java/org/apache/ranger/policyengine/RangerPolicyenginePerfTester.java @@ -69,8 +69,12 @@ public class RangerPolicyenginePerfTester { for(URL requestFileURL : requestFileURLs) { PerfTestClient perfTestClient = new PerfTestClient(perfTestEngine, 0, requestFileURL, 1); - perfTestClient.init(); - perfTestClient.run(); + if (perfTestClient.init()) { + perfTestClient.start(); + perfTestClient.join(); + } else { + LOG.error("Error initializing warm-up PerfTestClient"); + } } } catch(Throwable t) { LOG.error("Error during warmup", t);
