You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/09/24 14:15:08 UTC
[2/2] hadoop git commit: HDFS-9076. Log full path instead of inodeId
in DFSClient#closeAllFilesBeingWritten() (Contributed by Surendra Singh
Lilhore)
HDFS-9076. Log full path instead of inodeId in DFSClient#closeAllFilesBeingWritten() (Contributed by Surendra Singh Lilhore)
(cherry picked from commit e52bc697f8f9c255dfc4d01b71272931153721c9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a0ff9af8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a0ff9af8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a0ff9af8
Branch: refs/heads/branch-2
Commit: a0ff9af827d8f0e5471ba4e25b44a414e15c9558
Parents: d148b6a
Author: Vinayakumar B <vi...@apache.org>
Authored: Thu Sep 24 17:43:23 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Thu Sep 24 17:44:18 2015 +0530
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/hdfs/DFSClient.java | 4 ++--
.../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 7 +++++++
3 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0ff9af8/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 f4526ff..580629b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1053,6 +1053,9 @@ Release 2.8.0 - UNRELEASED
TestSWebHdfsFileContextMainOperations fail due to invalid HDFS path on
Windows. (Chris Nauroth via wheat9)
+ HDFS-9076. Log full path instead of inodeId in DFSClient
+ #closeAllFilesBeingWritten() (Surendra Singh Lilhore via vinayakumarb)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0ff9af8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
index f1e8905..496b079 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
@@ -589,8 +589,8 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
out.close();
}
} catch(IOException ie) {
- LOG.error("Failed to " + (abort? "abort": "close") +
- " inode " + inodeId, ie);
+ LOG.error("Failed to " + (abort ? "abort" : "close") + " file: "
+ + out.getSrc() + " with inode: " + inodeId, ie);
}
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a0ff9af8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
index 5cd40a5..5466936 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
@@ -908,6 +908,13 @@ public class DFSOutputStream extends FSOutputSummer
}
/**
+ * Return the source of stream.
+ */
+ String getSrc() {
+ return src;
+ }
+
+ /**
* Returns the data streamer object.
*/
protected DataStreamer getStreamer() {