Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 40d18cf6b -> 6e7b33bdb
RANGER-891: Audit shutdown hook to be registered with Hadoop ShutdownHookManager instead of directly with Java Runtime Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/6e7b33bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6e7b33bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6e7b33bd Branch: refs/heads/ranger-0.5 Commit: 6e7b33bdb994b866bb53db266afd03764b1de077 Parents: 40d18cf Author: Alok Lal <[email protected]> Authored: Wed Apr 27 21:07:41 2016 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Fri May 20 08:08:42 2016 -0700 ---------------------------------------------------------------------- .../org/apache/ranger/audit/provider/AuditProviderFactory.java | 5 ++++- src/main/assembly/plugin-solr.xml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6e7b33bd/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java index cb998cd..b95e2a9 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.util.ShutdownHookManager; import org.apache.ranger.audit.destination.DBAuditDestination; import org.apache.ranger.audit.destination.FileAuditDestination; import org.apache.ranger.audit.destination.HDFSAuditDestination; @@ -64,6 +65,8 @@ public class AuditProviderFactory { public static final int AUDIT_ASYNC_MAX_QUEUE_SIZE_DEFAULT = 10 * 1024; public static final int AUDIT_ASYNC_MAX_FLUSH_INTERVAL_DEFAULT = 5 * 1000; + private static final int RANGER_AUDIT_SHUTDOWN_HOOK_PRIORITY = 30; + private static AuditProviderFactory sFactory; private AuditHandler mProvider = null; @@ -448,7 +451,7 @@ public class AuditProviderFactory { private void installJvmSutdownHook(Properties props) { int shutdownHookMaxWaitSeconds = MiscUtil.getIntProperty(props, AUDIT_SHUTDOWN_HOOK_MAX_WAIT_SEC, AUDIT_SHUTDOWN_HOOK_MAX_WAIT_SEC_DEFAULT); JVMShutdownHook jvmShutdownHook = new JVMShutdownHook(mProvider, shutdownHookMaxWaitSeconds); - Runtime.getRuntime().addShutdownHook(jvmShutdownHook); + ShutdownHookManager.get().addShutdownHook(jvmShutdownHook, RANGER_AUDIT_SHUTDOWN_HOOK_PRIORITY); } private static class RangerAsyncAuditCleanup implements Runnable { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6e7b33bd/src/main/assembly/plugin-solr.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-solr.xml b/src/main/assembly/plugin-solr.xml index 31ebd6b..9d5e57a 100644 --- a/src/main/assembly/plugin-solr.xml +++ b/src/main/assembly/plugin-solr.xml @@ -30,6 +30,7 @@ <outputDirectory>/lib</outputDirectory> <unpack>false</unpack> <includes> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>com.google.code.gson:gson</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include>
