You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2021/10/21 02:38:18 UTC
[ranger] branch master updated: RANGER-3478:Remove INFO level
auditing logs in the Ranger audit frame to reduce verbosity
This is an automated email from the ASF dual-hosted git repository.
rmani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new ed6ece2 RANGER-3478:Remove INFO level auditing logs in the Ranger audit frame to reduce verbosity
ed6ece2 is described below
commit ed6ece29088490074afc55c2f3254ed05b4064b8
Author: Ramesh Mani <rm...@apache.org>
AuthorDate: Mon Oct 18 23:44:43 2021 -0700
RANGER-3478:Remove INFO level auditing logs in the Ranger audit frame to reduce verbosity
Signed-off-by: Ramesh Mani <rm...@apache.org>
---
.../audit/destination/HDFSAuditDestination.java | 11 +++-
.../ranger/audit/provider/BaseAuditHandler.java | 60 +++++++++++-----------
.../audit/utils/AbstractRangerAuditWriter.java | 7 ++-
.../ranger/audit/utils/RangerJSONAuditWriter.java | 3 +-
4 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
index ec9dc4b..474c3ba 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
@@ -86,7 +86,9 @@ public class HDFSAuditDestination extends AuditDestination {
logError("Error writing to log file.", t);
return false;
} finally {
- logger.info("Flushing HDFS audit. Event Size:" + events.size());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Flushing HDFS audit. Event Size:" + events.size());
+ }
if (auditWriter != null) {
flush();
}
@@ -125,7 +127,9 @@ public class HDFSAuditDestination extends AuditDestination {
@Override
public void flush() {
- logger.info("Flush called. name=" + getName());
+ if (logger.isDebugEnabled()) {
+ logger.debug("==> HDFSAuditDestination.flush() called. name=" + getName());
+ }
MiscUtil.executePrivilegedAction(new PrivilegedAction<Void>() {
@Override
public Void run() {
@@ -133,6 +137,9 @@ public class HDFSAuditDestination extends AuditDestination {
return null;
}
});
+ if (logger.isDebugEnabled()) {
+ logger.debug("<== HDFSAuditDestination.flush() called. name=" + getName());
+ }
}
/*
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
index 1987856..9a61fa9 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BaseAuditHandler.java
@@ -306,36 +306,38 @@ public abstract class BaseAuditHandler implements AuditHandler {
lastStashedCount = totalStashedCount;
lastDeferredCount = totalDeferredCount;
- String finalPath = "";
- String tFinalPath = getFinalPath();
- if (!getName().equals(tFinalPath)) {
- finalPath = ", finalDestination=" + tFinalPath;
+ if (LOG.isDebugEnabled()) {
+ String finalPath = "";
+ String tFinalPath = getFinalPath();
+ if (!getName().equals(tFinalPath)) {
+ finalPath = ", finalDestination=" + tFinalPath;
+ }
+
+ String msg = "Audit Status Log: name="
+ + getName()
+ + finalPath
+ + ", interval="
+ + formatIntervalForLog(diffTime)
+ + ", events="
+ + diffCount
+ + (diffSuccess > 0 ? (", succcessCount=" + diffSuccess)
+ : "")
+ + (diffFailed > 0 ? (", failedCount=" + diffFailed) : "")
+ + (diffStashed > 0 ? (", stashedCount=" + diffStashed) : "")
+ + (diffDeferred > 0 ? (", deferredCount=" + diffDeferred)
+ : "")
+ + ", totalEvents="
+ + totalCount
+ + (totalSuccessCount > 0 ? (", totalSuccessCount=" + totalSuccessCount)
+ : "")
+ + (totalFailedCount > 0 ? (", totalFailedCount=" + totalFailedCount)
+ : "")
+ + (totalStashedCount > 0 ? (", totalStashedCount=" + totalStashedCount)
+ : "")
+ + (totalDeferredCount > 0 ? (", totalDeferredCount=" + totalDeferredCount)
+ : "");
+ LOG.debug(msg);
}
-
- String msg = "Audit Status Log: name="
- + getName()
- + finalPath
- + ", interval="
- + formatIntervalForLog(diffTime)
- + ", events="
- + diffCount
- + (diffSuccess > 0 ? (", succcessCount=" + diffSuccess)
- : "")
- + (diffFailed > 0 ? (", failedCount=" + diffFailed) : "")
- + (diffStashed > 0 ? (", stashedCount=" + diffStashed) : "")
- + (diffDeferred > 0 ? (", deferredCount=" + diffDeferred)
- : "")
- + ", totalEvents="
- + totalCount
- + (totalSuccessCount > 0 ? (", totalSuccessCount=" + totalSuccessCount)
- : "")
- + (totalFailedCount > 0 ? (", totalFailedCount=" + totalFailedCount)
- : "")
- + (totalStashedCount > 0 ? (", totalStashedCount=" + totalStashedCount)
- : "")
- + (totalDeferredCount > 0 ? (", totalDeferredCount=" + totalDeferredCount)
- : "");
- LOG.info(msg);
} catch (Throwable t) {
LOG.error("Error while printing stats. auditProvider=" + getName());
}
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/utils/AbstractRangerAuditWriter.java b/agents-audit/src/main/java/org/apache/ranger/audit/utils/AbstractRangerAuditWriter.java
index b5967e4..d14bd38 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/utils/AbstractRangerAuditWriter.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/utils/AbstractRangerAuditWriter.java
@@ -293,7 +293,7 @@ public abstract class AbstractRangerAuditWriter implements RangerAuditWriter {
@Override
public void flush() {
if (logger.isDebugEnabled()) {
- logger.debug("==> AbstractRangerAuditWriter.flush()");
+ logger.debug("==> AbstractRangerAuditWriter.flush() " + fileSystemScheme);
}
if (ostream != null) {
try {
@@ -308,7 +308,10 @@ public abstract class AbstractRangerAuditWriter implements RangerAuditWriter {
ostream.hflush();
} else {
ostream.flush();
- } logger.info("Flush " + fileSystemScheme + " audit logs completed.....");
+ }
+ if (logger.isDebugEnabled()) {
+ logger.debug("Flush " + fileSystemScheme + " audit logs completed.....");
+ }
}
} catch (IOException e) {
logger.error("Error on flushing log writer: " + e.getMessage() +
diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RangerJSONAuditWriter.java b/agents-audit/src/main/java/org/apache/ranger/audit/utils/RangerJSONAuditWriter.java
index f46e0a5..bc7bb46 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/utils/RangerJSONAuditWriter.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/utils/RangerJSONAuditWriter.java
@@ -138,9 +138,8 @@ public class RangerJSONAuditWriter extends AbstractRangerAuditWriter {
public void flush() {
if (logger.isDebugEnabled()) {
- logger.debug("==> JSONWriter.flush()");
+ logger.debug("==> JSONWriter.flush() called. name=" + auditProviderName);
}
- logger.info("Flush called. name=" + auditProviderName);
super.flush();
if (logger.isDebugEnabled()) {
logger.debug("<== JSONWriter.flush()");