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 zj...@apache.org on 2015/04/18 00:35:34 UTC
[06/50] [abbrv] hadoop git commit: HDFS-8111. NPE thrown when invalid
FSImage filename given for 'hdfs oiv_legacy' cmd ( Contributed by surendra
singh lilhore )
HDFS-8111. NPE thrown when invalid FSImage filename given for 'hdfs oiv_legacy' cmd ( Contributed by surendra singh lilhore )
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/668d1581
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/668d1581
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/668d1581
Branch: refs/heads/YARN-2928
Commit: 668d1581a3885fd0f4ebf450558dafb92ba298cb
Parents: 8f7c5de
Author: Vinayakumar B <vi...@apache.org>
Authored: Mon Apr 13 17:16:05 2015 +0530
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri Apr 17 15:29:40 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hdfs/tools/offlineImageViewer/OfflineImageViewer.java | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/668d1581/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 134bba0..abbfe6a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -482,6 +482,9 @@ Release 2.8.0 - UNRELEASED
HDFS-7939. Two fsimage_rollback_* files are created which are not deleted
after rollback. (J.Andreina via vinayakumarb)
+ HDFS-8111. NPE thrown when invalid FSImage filename given for
+ 'hdfs oiv_legacy' cmd ( surendra singh lilhore via vinayakumarb )
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/668d1581/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
index 316ebca..7f81ba8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
@@ -137,7 +137,11 @@ public class OfflineImageViewer {
done = true;
} finally {
if (!done) {
- LOG.error("image loading failed at offset " + tracker.getPos());
+ if (tracker != null) {
+ LOG.error("image loading failed at offset " + tracker.getPos());
+ } else {
+ LOG.error("Failed to load image file.");
+ }
}
IOUtils.cleanup(LOG, in, tracker);
}