Repository: hadoop Updated Branches: refs/heads/branch-2 00fb0710b -> 35fecb530
HDFS-7797. Add audit log for setQuota operation (Rakesh R via umamahesh) (cherry picked from commit f24a56787a15e89a7c1e777b8043ab9ae8792505) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/35fecb53 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/35fecb53 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/35fecb53 Branch: refs/heads/branch-2 Commit: 35fecb530650fb7f37fa162f369bcdc5969549a7 Parents: 00fb071 Author: Uma Maheswara Rao G <umamah...@apache.org> Authored: Tue Feb 17 20:11:11 2015 +0530 Committer: Uma Maheswara Rao G <umamah...@apache.org> Committed: Tue Feb 17 20:16:34 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/35fecb53/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index a1b2053..58561d9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -344,6 +344,8 @@ Release 2.7.0 - UNRELEASED HDFS-7604. Track and display failed DataNode storage locations in NameNode. (cnauroth) + HDFS-7797. Add audit log for setQuota operation (Rakesh R via umamahesh) + OPTIMIZATIONS HDFS-7454. Reduce memory footprint for AclEntries in NameNode. http://git-wip-us.apache.org/repos/asf/hadoop/blob/35fecb53/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 15dec21..40f0bf2 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 @@ -3813,14 +3813,19 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, throws IOException { checkOperation(OperationCategory.WRITE); writeLock(); + boolean success = false; try { checkOperation(OperationCategory.WRITE); checkNameNodeSafeMode("Cannot set quota on " + src); FSDirAttrOp.setQuota(dir, src, nsQuota, ssQuota, type); + success = true; } finally { writeUnlock(); + if (success) { + getEditLog().logSync(); + } + logAuditEvent(success, "setQuota", src); } - getEditLog().logSync(); } /** Persist all metadata about this file.
