From 3395e01504aadc1b35e7767d91a5cc00f33121f0 Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Mon, 23 Jun 2014 07:22:25 +0000 Subject: [PATCH] HDFS-6580. Merge r1604704 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604705 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 970ce582044..cd39821ca65 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -442,6 +442,9 @@ Release 2.5.0 - UNRELEASED HDFS-6222. Remove background token renewer from webhdfs. (Rushabh Shah and Daryn Sharp via cnauroth) + HDFS-6580. FSNamesystem.mkdirsInt should call the getAuditFileInfo() + wrapper. (Zhilei Xu via wheat9) + BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) 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 34502a88367..df5d0dbba9b 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 @@ -3738,7 +3738,7 @@ public class FSNamesystem implements Namesystem, FSClusterStats, src = FSDirectory.resolvePath(src, pathComponents, dir); status = mkdirsInternal(pc, src, permissions, createParent); if (status) { - resultingStat = dir.getFileInfo(src, false); + resultingStat = getAuditFileInfo(src, false); } } finally { writeUnlock();