Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10793. Fix HdfsAuditLogger binary incompatibility introduced by HDFS-9184. Contributed by Manoj Govindassamy. 

(cherry picked from commit a445b82baa)
This commit is contained in:
Andrew Wang 2016-08-26 15:39:18 -07:00
parent f3a4cbcc60
commit 1c47a356d8
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -6837,6 +6837,15 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
}
}
@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);
}

23
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/HdfsAuditLogger.java
View File

@ -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);
}