Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-8111. NPE thrown when invalid FSImage filename given for 'hdfs oiv_legacy' cmd ( Contributed by surendra singh lilhore ) 

(cherry picked from commit 14384f5b51)
This commit is contained in:
Vinayakumar B 2015-04-13 17:16:05 +05:30
parent 293c763e82
commit 1071a57b20
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -164,6 +164,9 @@ Release 2.8.0 - UNRELEASED
HDFS-7939. Two fsimage_rollback_* files are created which are not deleted HDFS-7939. Two fsimage_rollback_* files are created which are not deleted
after rollback. (J.Andreina via vinayakumarb) 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 Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
View File

@ -137,7 +137,11 @@ public class OfflineImageViewer {
done = true; done = true;
} finally { } finally {
if (!done) { 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); IOUtils.cleanup(LOG, in, tracker);
} }