Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9EA39200D2B for ; Thu, 2 Nov 2017 18:30:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9D1DB160BFB; Thu, 2 Nov 2017 17:30:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EC5761609EB for ; Thu, 2 Nov 2017 18:30:04 +0100 (CET) Received: (qmail 12009 invoked by uid 500); 2 Nov 2017 17:29:54 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 11062 invoked by uid 99); 2 Nov 2017 17:29:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2017 17:29:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEAFBF5E01; Thu, 2 Nov 2017 17:29:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: haibochen@apache.org To: common-commits@hadoop.apache.org Date: Thu, 02 Nov 2017 17:30:26 -0000 Message-Id: <2fcd61c2055a4c55bdb079725a39a589@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] hadoop git commit: YARN-7400. Incorrect log preview displayed in jobhistory server ui. Contributed by Xuan Gong. archived-at: Thu, 02 Nov 2017 17:30:05 -0000 YARN-7400. Incorrect log preview displayed in jobhistory server ui. Contributed by Xuan Gong. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d57dba99 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d57dba99 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d57dba99 Branch: refs/heads/YARN-1011 Commit: d57dba99428cbe3f3dfcec834d79f709e7529ef9 Parents: 70f1a94 Author: Junping Du Authored: Wed Nov 1 14:48:16 2017 -0700 Committer: Junping Du Committed: Wed Nov 1 14:48:16 2017 -0700 ---------------------------------------------------------------------- .../filecontroller/ifile/IndexedFileAggregatedLogsBlock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d57dba99/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/IndexedFileAggregatedLogsBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/IndexedFileAggregatedLogsBlock.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/IndexedFileAggregatedLogsBlock.java index 5439b53..db2915a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/IndexedFileAggregatedLogsBlock.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/filecontroller/ifile/IndexedFileAggregatedLogsBlock.java @@ -221,8 +221,8 @@ public class IndexedFileAggregatedLogsBlock extends LogAggregationHtmlBlock { __(" for the full log.").__(); } long totalSkipped = 0; - while (totalSkipped < start) { - long ret = in.skip(start - totalSkipped); + while (totalSkipped < startIndex) { + long ret = in.skip(startIndex - totalSkipped); if (ret == 0) { //Read one byte int nextByte = in.read(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org