-
Notifications
You must be signed in to change notification settings - Fork 993
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
RANGER-4876: Plugin Analytics #369
base: master
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -75,6 +75,7 @@ public class RangerBasePlugin { | |
private final List<RangerChainedPlugin> chainedPlugins; | ||
private final boolean dedupStrings; | ||
private boolean isUserStoreEnricherAddedImplcitly = false; | ||
private final RangerPluginAnalytics pluginAnalytics; | ||
|
||
|
||
public RangerBasePlugin(String serviceType, String appId) { | ||
|
@@ -86,6 +87,7 @@ public RangerBasePlugin(String serviceType, String serviceName, String appId) { | |
} | ||
|
||
public RangerBasePlugin(RangerPluginConfig pluginConfig) { | ||
this.pluginAnalytics = new RangerPluginAnalytics(); | ||
this.pluginConfig = pluginConfig; | ||
this.pluginContext = new RangerPluginContext(pluginConfig); | ||
|
||
|
@@ -268,6 +270,7 @@ public void init() { | |
for (RangerChainedPlugin chainedPlugin : chainedPlugins) { | ||
chainedPlugin.init(); | ||
} | ||
pluginAnalytics.startPluginAnalytics(); | ||
} | ||
|
||
public long getPoliciesVersion() { | ||
|
@@ -494,6 +497,9 @@ public void cleanup() { | |
if (policyEngine != null) { | ||
((RangerPolicyEngineImpl) policyEngine).releaseResources(true); | ||
} | ||
if (pluginAnalytics!=null) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do we need null check ?. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I was adding it as a safety net based on other surrounding variables such as policyEnginer. Not really required. Removed it on second thoughts since it is never set to null unlike policyEngine. |
||
pluginAnalytics.stopPluginAnalytics(); | ||
} | ||
} | ||
|
||
public void setResultProcessor(RangerAccessResultProcessor resultProcessor) { | ||
|
@@ -513,6 +519,7 @@ public Collection<RangerAccessResult> isAccessAllowed(Collection<RangerAccessReq | |
} | ||
|
||
public RangerAccessResult isAccessAllowed(RangerAccessRequest request, RangerAccessResultProcessor resultProcessor) { | ||
pluginAnalytics.addIsAccessAllowedCount(); | ||
RangerAccessResult ret = null; | ||
RangerPolicyEngine policyEngine = this.policyEngine; | ||
|
||
|
@@ -558,6 +565,7 @@ public RangerAccessResult isAccessAllowed(RangerAccessRequest request, RangerAcc | |
} | ||
|
||
public Collection<RangerAccessResult> isAccessAllowed(Collection<RangerAccessRequest> requests, RangerAccessResultProcessor resultProcessor) { | ||
pluginAnalytics.addIsAccessAllowedCount(); | ||
Collection<RangerAccessResult> ret = null; | ||
RangerPolicyEngine policyEngine = this.policyEngine; | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.ranger.plugin.service; | ||
|
||
import java.util.concurrent.Executors; | ||
import java.util.concurrent.ScheduledExecutorService; | ||
import java.util.concurrent.ScheduledFuture; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
import java.util.concurrent.atomic.DoubleAccumulator; | ||
|
||
import static java.util.concurrent.TimeUnit.SECONDS; | ||
|
||
public class RangerPluginAnalytics { | ||
private static final Logger LOG = LoggerFactory.getLogger(RangerPluginAnalytics.class); | ||
private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); | ||
private static final int SLEEP_DURATION = 300; | ||
private ScheduledFuture<?> statusHandler; | ||
|
||
private final DoubleAccumulator countIsAccessAllowed = new DoubleAccumulator(Double::sum, 0L); | ||
final Runnable asyncLoggerPluginAnalytics = () -> { | ||
LOG.info("===========Ranger Plugin Analytics============="); | ||
LOG.info("Accumulation period in seconds:"+SLEEP_DURATION); | ||
LOG.info("Number of times isAccessAllowed was called:"+countIsAccessAllowed.getThenReset()); | ||
}; | ||
|
||
public void startPluginAnalytics() { | ||
stopPluginAnalytics(); | ||
LOG.info("Starting Scheduled Plugin Analytics"); | ||
statusHandler = scheduler.scheduleWithFixedDelay(asyncLoggerPluginAnalytics, 0, SLEEP_DURATION, SECONDS); | ||
} | ||
|
||
public void stopPluginAnalytics() { | ||
if (statusHandler == null){ | ||
LOG.info("statusHandler is null, stop not required for asyncLoggerPluginAnalytics"); | ||
return; | ||
} | ||
LOG.info("Attempting to cancel asyncLoggerPluginAnalytics"); | ||
try { | ||
scheduler.shutdown(); | ||
statusHandler.cancel(true); | ||
} | ||
catch (Exception e){ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you please replace "Exception e" to the specific exception which are thrown from try block ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed. No exception thrown by these functions according to the documentation |
||
LOG.info("Exception while trying to shutdown/cancel asyncLoggerPluginAnalytics"); | ||
} | ||
if (statusHandler.isCancelled()){ | ||
LOG.info("Canceled asyncLoggerPluginAnalytics"); | ||
} | ||
else{ | ||
|
||
LOG.info("Could not cancel asyncLoggerPluginAnalytics"); | ||
} | ||
} | ||
|
||
public void addIsAccessAllowedCount(){ | ||
countIsAccessAllowed.accumulate(1); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RangerBasePlugin has 6 constructor, "pluginAnalytics " instance variable is not getting initialised from all 6 code paths. Please do let me know if i am looking the wrong code base.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see just 4 constructors - line 511, 515, 519 and 565 - in RangerBasePlugin.java
@vyommani Can you point to the other 2 constructors you are seeing ?
Constructor 1: Always calls constructor 3
Constructor 2: Always calls constructor 4
So I added pluginAnalytics function calls only for constructor 3 and constructor 4.
Adding it to all the 4 constructors would result in double counting