From fa58cfc2dfac3ef2fc41c4e1e8f203c103c88e15 Mon Sep 17 00:00:00 2001 From: xianjingfeng Date: Thu, 28 Mar 2024 17:54:55 +0800 Subject: [PATCH] minor optimization for ranger plugin --- .../ranger/doris/RangerDorisAccessController.java | 4 ++-- .../ranger/hive/RangerHiveAccessController.java | 5 ++--- .../ranger/hive/RangerHiveAuditLogFlusher.java | 10 +--------- .../authorizer/ranger/hive/RangerHivePlugin.java | 4 ++-- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/doris/RangerDorisAccessController.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/doris/RangerDorisAccessController.java index f8c38ba78e9da5..a87a33c30a5d87 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/doris/RangerDorisAccessController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/doris/RangerDorisAccessController.java @@ -47,8 +47,8 @@ public class RangerDorisAccessController extends RangerAccessController { // "ranger-doris-audit-log-flusher-timer", true); // private RangerHiveAuditHandler auditHandler; - public RangerDorisAccessController(String serviceName) { - dorisPlugin = new RangerDorisPlugin(serviceName); + public RangerDorisAccessController(String serviceType) { + dorisPlugin = new RangerDorisPlugin(serviceType); // auditHandler = new RangerHiveAuditHandler(dorisPlugin.getConfig()); // start a timed log flusher // logFlushTimer.scheduleAtFixedRate(new RangerHiveAuditLogFlusher(auditHandler), 10, 20L, TimeUnit.SECONDS); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAccessController.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAccessController.java index 8c7f672bdcbf1b..553f9ede110d69 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAccessController.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAccessController.java @@ -57,8 +57,8 @@ public class RangerHiveAccessController extends RangerAccessController { private RangerHiveAuditHandler auditHandler; public RangerHiveAccessController(Map properties) { - String serviceName = properties.get("ranger.service.name"); - hivePlugin = new RangerHivePlugin(serviceName); + String serviceType = properties.get("ranger.service.type"); + hivePlugin = new RangerHivePlugin(serviceType); auditHandler = new RangerHiveAuditHandler(hivePlugin.getConfig()); // start a timed log flusher logFlushTimer.scheduleAtFixedRate(new RangerHiveAuditLogFlusher(auditHandler), 10, 20L, TimeUnit.SECONDS); @@ -219,7 +219,6 @@ protected RangerAccessResultProcessor getAccessResultProcessor() { // For test only public static void main(String[] args) { Map properties = Maps.newHashMap(); - properties.put("ranger.service.name", "hive"); RangerHiveAccessController ac = new RangerHiveAccessController(properties); UserIdentity user = new UserIdentity("user1", "127.0.0.1"); user.setIsAnalyzed(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAuditLogFlusher.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAuditLogFlusher.java index e8afda11462108..a7c7a8fb018e07 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAuditLogFlusher.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHiveAuditLogFlusher.java @@ -31,14 +31,6 @@ public RangerHiveAuditLogFlusher(RangerHiveAuditHandler auditHandler) { @Override public void run() { - while (true) { - this.auditHandler.flushAudit(); - - try { - Thread.sleep(20000); - } catch (InterruptedException e) { - log.info("error ", e); - } - } + this.auditHandler.flushAudit(); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHivePlugin.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHivePlugin.java index cf675b9a1025e4..d0e59100722fef 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHivePlugin.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/authorizer/ranger/hive/RangerHivePlugin.java @@ -20,8 +20,8 @@ import org.apache.ranger.plugin.service.RangerBasePlugin; public class RangerHivePlugin extends RangerBasePlugin { - public RangerHivePlugin(String serviceName) { - super(serviceName, null, null); + public RangerHivePlugin(String serviceType) { + super(serviceType, null, null); super.init(); } }