From 65fd55768d370e4fcfdc83c5b816bad9a46f4f96 Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Wed, 19 Mar 2014 01:10:50 +0000 Subject: [PATCH] Merge r1579104 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579106 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/INodeId.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 7536a229c90..42a526dcd5d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -400,6 +400,9 @@ Release 2.4.0 - UNRELEASED HDFS-5516. WebHDFS does not require user name when anonymous http requests are disallowed. (Miodrag Radulovic via cnauroth) + HDFS-6117. Print file path information in FileNotFoundException on INode + ID mismatch. (suresh) + BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeId.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeId.java index 384eb2dd0c2..312bb380ebb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeId.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeId.java @@ -52,7 +52,7 @@ public class INodeId extends SequentialNumber { if (requestId != GRANDFATHER_INODE_ID && requestId != inode.getId()) { throw new FileNotFoundException( "ID mismatch. Request id and saved id: " + requestId + " , " - + inode.getId()); + + inode.getId() + " for file " + inode.getFullPathName()); } }