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 84E8410B0B for ; Fri, 1 Nov 2013 04:27:53 +0000 (UTC) Received: (qmail 73848 invoked by uid 500); 1 Nov 2013 04:27:52 -0000 Delivered-To: apmail-kafka-commits-archive@kafka.apache.org Received: (qmail 73839 invoked by uid 500); 1 Nov 2013 04:27:50 -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 73831 invoked by uid 99); 1 Nov 2013 04:27:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Nov 2013 04:27:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D5A98D280; Fri, 1 Nov 2013 04:27:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nehanarkhede@apache.org To: commits@kafka.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: KAFKA-1107 Follow up review cleanup comments Date: Fri, 1 Nov 2013 04:27:47 +0000 (UTC) Updated Branches: refs/heads/trunk ec547737d -> a4fafefdb KAFKA-1107 Follow up review cleanup comments Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/a4fafefd Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/a4fafefd Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/a4fafefd Branch: refs/heads/trunk Commit: a4fafefdb3a2701d30f14feed3be11f1c0905c31 Parents: ec54773 Author: Neha Narkhede Authored: Thu Oct 31 21:27:38 2013 -0700 Committer: Neha Narkhede Committed: Thu Oct 31 21:27:38 2013 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/log/Log.scala | 3 +-- core/src/test/scala/unit/kafka/log/LogTest.scala | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/a4fafefd/core/src/main/scala/kafka/log/Log.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/log/Log.scala b/core/src/main/scala/kafka/log/Log.scala index a0e1b11..9205128 100644 --- a/core/src/main/scala/kafka/log/Log.scala +++ b/core/src/main/scala/kafka/log/Log.scala @@ -165,8 +165,7 @@ class Log(val dir: File, private def recoverLog() { val lastOffset = try {activeSegment.nextOffset} catch {case _: Throwable => -1L} - val cleanShutdownFile = new File(dir.getParentFile, CleanShutdownFile) - val needsRecovery = !cleanShutdownFile.exists() + val needsRecovery = !(new File(dir.getParentFile, CleanShutdownFile)).exists() if(!needsRecovery) { this.recoveryPoint = lastOffset return http://git-wip-us.apache.org/repos/asf/kafka/blob/a4fafefd/core/src/test/scala/unit/kafka/log/LogTest.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/unit/kafka/log/LogTest.scala b/core/src/test/scala/unit/kafka/log/LogTest.scala index 0b516f9..1571f1e 100644 --- a/core/src/test/scala/unit/kafka/log/LogTest.scala +++ b/core/src/test/scala/unit/kafka/log/LogTest.scala @@ -628,7 +628,7 @@ class LogTest extends JUnitSuite { val cleanShutdownFile = new File(parentLogDir, Log.CleanShutdownFile) cleanShutdownFile.createNewFile() assertTrue(".kafka_cleanshutdown must exist", cleanShutdownFile.exists()) - var recoveryPoint = 50L + var recoveryPoint = 0L // create a log and write some messages to it var log = new Log(logDir, config,