Repository: hadoop Updated Branches: refs/heads/trunk f7a17b029 -> b779f4f0f
YARN-8106. Update LogAggregationIndexedFileController to use readFull instead read to avoid IOException while loading log meta. (Prabhu Joseph via wangda) Change-Id: I63a65f73f8d1636e2c99ed9c8c2bbd05efcff80f Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b779f4f0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b779f4f0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b779f4f0 Branch: refs/heads/trunk Commit: b779f4f0f614fe47e05bc2be5494cf3cbcf6f63c Parents: f7a17b0 Author: Wangda Tan <wan...@apache.org> Authored: Tue Apr 3 21:06:24 2018 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Tue Apr 3 21:06:24 2018 -0700 ---------------------------------------------------------------------- .../filecontroller/ifile/LogAggregationIndexedFileController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b779f4f0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java index 5bba2e0..a8ae06f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java @@ -865,7 +865,8 @@ public class LogAggregationIndexedFileController byte[] array = new byte[offset]; fsDataIStream.seek( fileLength - offset - Integer.SIZE/ Byte.SIZE - UUID_LENGTH); - int actual = fsDataIStream.read(array); + fsDataIStream.readFully(array); + int actual = array.length; if (actual != offset) { throw new IOException("Error on loading log meta from " + remoteLogPath); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org