You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2018/02/20 15:19:34 UTC
[kafka] branch trunk updated: KAFKA-6568: Minor clean-ups follow-up
(#4592)
This is an automated email from the ASF dual-hosted git repository.
ijuma 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 a413733 KAFKA-6568: Minor clean-ups follow-up (#4592)
a413733 is described below
commit a41373309497da449a1f757e2c24399794d77072
Author: Jiangjie (Becket) Qin <be...@gmail.com>
AuthorDate: Tue Feb 20 07:19:30 2018 -0800
KAFKA-6568: Minor clean-ups follow-up (#4592)
Reviewers: Ismael Juma <is...@juma.me.uk>
---
.../main/scala/kafka/log/LogCleanerManager.scala | 4 +++
.../unit/kafka/log/LogCleanerManagerTest.scala | 36 +++++-----------------
2 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/core/src/main/scala/kafka/log/LogCleanerManager.scala b/core/src/main/scala/kafka/log/LogCleanerManager.scala
index b23107b..223c611 100755
--- a/core/src/main/scala/kafka/log/LogCleanerManager.scala
+++ b/core/src/main/scala/kafka/log/LogCleanerManager.scala
@@ -314,6 +314,8 @@ private[log] class LogCleanerManager(val logDirs: Seq[File],
case Some(LogCleaningAborted) =>
inProgress.put(topicPartition, LogCleaningPaused)
pausedCleaningCond.signalAll()
+ case None =>
+ throw new IllegalStateException(s"State for partition $topicPartition should exist.")
case s =>
throw new IllegalStateException(s"In-progress partition $topicPartition cannot be in $s state.")
}
@@ -328,6 +330,8 @@ private[log] class LogCleanerManager(val logDirs: Seq[File],
case Some(LogCleaningAborted) =>
inProgress.put(topicPartition, LogCleaningPaused)
pausedCleaningCond.signalAll()
+ case None =>
+ throw new IllegalStateException(s"State for partition $topicPartition should exist.")
case s =>
throw new IllegalStateException(s"In-progress partition $topicPartition cannot be in $s state.")
}
diff --git a/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala b/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala
index 42a447a..7455763 100644
--- a/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala
+++ b/core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala
@@ -226,20 +226,10 @@ class LogCleanerManagerTest extends JUnitSuite with Logging {
val cleanerManager: LogCleanerManager = createCleanerManager(log)
val tp = new TopicPartition("log", 0)
- try {
- cleanerManager.doneCleaning(tp, log.dir, 1)
- } catch {
- case _ : IllegalStateException =>
- case _ : Throwable => fail("Should have thrown IllegalStateException.")
- }
-
- try {
- cleanerManager.setCleaningState(tp, LogCleaningPaused)
- cleanerManager.doneCleaning(tp, log.dir, 1)
- } catch {
- case _ : IllegalStateException =>
- case _ : Throwable => fail("Should have thrown IllegalStateException.")
- }
+ intercept[IllegalStateException](cleanerManager.doneCleaning(tp, log.dir, 1))
+
+ cleanerManager.setCleaningState(tp, LogCleaningPaused)
+ intercept[IllegalStateException](cleanerManager.doneCleaning(tp, log.dir, 1))
cleanerManager.setCleaningState(tp, LogCleaningInProgress)
cleanerManager.doneCleaning(tp, log.dir, 1)
@@ -260,20 +250,10 @@ class LogCleanerManagerTest extends JUnitSuite with Logging {
val tp = new TopicPartition("log", 0)
- try {
- cleanerManager.doneDeleting(tp)
- } catch {
- case _ : IllegalStateException =>
- case _ : Throwable => fail("Should have thrown IllegalStateException.")
- }
-
- try {
- cleanerManager.setCleaningState(tp, LogCleaningPaused)
- cleanerManager.doneDeleting(tp)
- } catch {
- case _ : IllegalStateException =>
- case _ : Throwable => fail("Should have thrown IllegalStateException.")
- }
+ intercept[IllegalStateException](cleanerManager.doneDeleting(tp))
+
+ cleanerManager.setCleaningState(tp, LogCleaningPaused)
+ intercept[IllegalStateException](cleanerManager.doneDeleting(tp))
cleanerManager.setCleaningState(tp, LogCleaningInProgress)
cleanerManager.doneDeleting(tp)
--
To stop receiving notification emails like this one, please contact
ijuma@apache.org.