From commits-return-9225-apmail-kafka-commits-archive=kafka.apache.org@kafka.apache.org Sun Mar 18 18:22:00 2018 Return-Path: X-Original-To: apmail-kafka-commits-archive@www.apache.org Delivered-To: apmail-kafka-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 041E01748C for ; Sun, 18 Mar 2018 18:22:00 +0000 (UTC) Received: (qmail 4212 invoked by uid 500); 18 Mar 2018 18:21:54 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 4164 invoked by uid 500); 18 Mar 2018 18:21:54 -0000 Mailing-List: contact commits-help@kafka.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kafka.apache.org Delivered-To: mailing list commits@kafka.apache.org Received: (qmail 4155 invoked by uid 99); 18 Mar 2018 18:21:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Mar 2018 18:21:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 0632480619; Sun, 18 Mar 2018 18:21:54 +0000 (UTC) Date: Sun, 18 Mar 2018 18:21:53 +0000 To: "commits@kafka.apache.org" Subject: [kafka] branch trunk updated: MINOR: Use log start offset as high watermark if current value is out of range (#4722) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152139731351.30198.7980403157798742090@gitbox.apache.org> From: jgus@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: kafka X-Git-Refname: refs/heads/trunk X-Git-Reftype: branch X-Git-Oldrev: 7fe06a86665e513f73caff824a36a723ab21c917 X-Git-Newrev: 4391a4214de7594e64de4b0b0d5a1196813b04b8 X-Git-Rev: 4391a4214de7594e64de4b0b0d5a1196813b04b8 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jgus pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git The following commit(s) were added to refs/heads/trunk by this push: new 4391a42 MINOR: Use log start offset as high watermark if current value is out of range (#4722) 4391a42 is described below commit 4391a4214de7594e64de4b0b0d5a1196813b04b8 Author: Dong Lin AuthorDate: Sun Mar 18 11:21:44 2018 -0700 MINOR: Use log start offset as high watermark if current value is out of range (#4722) Reviewers: Jun Rao , Jason Gustafson --- core/src/main/scala/kafka/cluster/Replica.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/kafka/cluster/Replica.scala b/core/src/main/scala/kafka/cluster/Replica.scala index 030e5b7..4b65e43 100644 --- a/core/src/main/scala/kafka/cluster/Replica.scala +++ b/core/src/main/scala/kafka/cluster/Replica.scala @@ -175,8 +175,10 @@ class Replica(val brokerId: Int, def convertHWToLocalOffsetMetadata() { if (isLocal) { highWatermarkMetadata = log.get.convertToOffsetMetadata(highWatermarkMetadata.messageOffset).getOrElse { - val firstOffset = log.get.logSegments.head.baseOffset - new LogOffsetMetadata(firstOffset, firstOffset, 0) + log.get.convertToOffsetMetadata(logStartOffset).getOrElse { + val firstSegmentOffset = log.get.logSegments.head.baseOffset + new LogOffsetMetadata(firstSegmentOffset, firstSegmentOffset, 0) + } } } else { throw new KafkaException(s"Should not construct complete high watermark on partition $topicPartition's non-local replica $brokerId") -- To stop receiving notification emails like this one, please contact jgus@apache.org.