You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2016/09/01 15:50:14 UTC
[18/50] [abbrv] hadoop git commit: HDFS-10793. Fix HdfsAuditLogger
binary incompatibility introduced by HDFS-9184. Contributed by Manoj
Govindassamy.
HDFS-10793. Fix HdfsAuditLogger binary incompatibility introduced by HDFS-9184. Contributed by Manoj Govindassamy.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a445b82b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a445b82b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a445b82b
Branch: refs/heads/HDFS-7240
Commit: a445b82baaa58dcaaa3831e724a9915e9dde57c5
Parents: 407b519
Author: Andrew Wang <wa...@apache.org>
Authored: Fri Aug 26 15:39:18 2016 -0700
Committer: Andrew Wang <wa...@apache.org>
Committed: Fri Aug 26 15:39:18 2016 -0700
----------------------------------------------------------------------
.../hdfs/server/namenode/FSNamesystem.java | 10 +++++++++
.../hdfs/server/namenode/HdfsAuditLogger.java | 23 ++++++++++++++++----
2 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a445b82b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 05fd709..52fbaa7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -7010,6 +7010,16 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
logAuditMessage(sb.toString());
}
}
+
+ @Override
+ public void logAuditEvent(boolean succeeded, String userName,
+ InetAddress addr, String cmd, String src, String dst,
+ FileStatus status, UserGroupInformation ugi,
+ DelegationTokenSecretManager dtSecretManager) {
+ this.logAuditEvent(succeeded, userName, addr, cmd, src, dst, status,
+ null /*CallerContext*/, ugi, dtSecretManager);
+ }
+
public void logAuditMessage(String message) {
auditLog.info(message);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a445b82b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/HdfsAuditLogger.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/HdfsAuditLogger.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/HdfsAuditLogger.java
index 3e95ce1..894c4df 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/HdfsAuditLogger.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/HdfsAuditLogger.java
@@ -43,9 +43,9 @@ public abstract class HdfsAuditLogger implements AuditLogger {
/**
* Same as
- * {@link #logAuditEvent(boolean, String, InetAddress, String, String, String, FileStatus)}
- * with additional parameters related to logging delegation token tracking
- * IDs.
+ * {@link #logAuditEvent(boolean, String, InetAddress, String, String, String,
+ * FileStatus)} with additional parameters related to logging delegation token
+ * tracking IDs.
*
* @param succeeded Whether authorization succeeded.
* @param userName Name of the user executing the request.
@@ -55,13 +55,28 @@ public abstract class HdfsAuditLogger implements AuditLogger {
* @param dst Path of affected destination file (if any).
* @param stat File information for operations that change the file's metadata
* (permissions, owner, times, etc).
+ * @param callerContext Context information of the caller
* @param ugi UserGroupInformation of the current user, or null if not logging
* token tracking information
* @param dtSecretManager The token secret manager, or null if not logging
* token tracking information
*/
- public abstract void logAuditEvent(boolean succeeded, String userName,
+ public void logAuditEvent(boolean succeeded, String userName,
InetAddress addr, String cmd, String src, String dst,
FileStatus stat, CallerContext callerContext, UserGroupInformation ugi,
+ DelegationTokenSecretManager dtSecretManager) {
+ logAuditEvent(succeeded, userName, addr, cmd, src, dst, stat,
+ ugi, dtSecretManager);
+ }
+
+ /**
+ * Same as
+ * {@link #logAuditEvent(boolean, String, InetAddress, String, String,
+ * String, FileStatus, CallerContext, UserGroupInformation,
+ * DelegationTokenSecretManager)} without {@link CallerContext} information.
+ */
+ public abstract void logAuditEvent(boolean succeeded, String userName,
+ InetAddress addr, String cmd, String src, String dst,
+ FileStatus stat, UserGroupInformation ugi,
DelegationTokenSecretManager dtSecretManager);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org