Repository: hadoop Updated Branches: refs/heads/branch-2 c18446693 -> 5870d504e
HDFS-8176. Record from/to snapshots in audit log for snapshot diff report. Contributed by J. Andreina. (cherry picked from commit cf6c8a1b4ee70dd45c2e42ac61999e61a05db035) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5870d504 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5870d504 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5870d504 Branch: refs/heads/branch-2 Commit: 5870d504e1a30ec320c2533c8a6980b5b2f46947 Parents: c184466 Author: Jing Zhao <ji...@apache.org> Authored: Fri Apr 24 10:23:32 2015 -0700 Committer: Jing Zhao <ji...@apache.org> Committed: Fri Apr 24 10:24:12 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5870d504/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 faf2320..75e261d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -151,6 +151,9 @@ Release 2.8.0 - UNRELEASED HDFS-8052. Move WebHdfsFileSystem into hadoop-hdfs-client. (wheat9) + HDFS-8176. Record from/to snapshots in audit log for snapshot diff report. + (J. Andreina via jing9) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/5870d504/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 f175301..b2b68c6 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 @@ -7400,8 +7400,12 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, } finally { readUnlock(); } - - logAuditEvent(diffs != null, "computeSnapshotDiff", null, null, null); + String fromSnapshotRoot = (fromSnapshot == null || fromSnapshot.isEmpty()) ? + path : Snapshot.getSnapshotPath(path, fromSnapshot); + String toSnapshotRoot = (toSnapshot == null || toSnapshot.isEmpty()) ? + path : Snapshot.getSnapshotPath(path, toSnapshot); + logAuditEvent(diffs != null, "computeSnapshotDiff", fromSnapshotRoot, + toSnapshotRoot, null); return diffs; }
