Skip to content

MINOR: trivial cleanups #6767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hachikuji merged 6 commits into from
May 24, 2019
Merged

MINOR: trivial cleanups #6767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd4575e
Remove ununsed import from CommandLineUtils.scala
dongjinleekr May 15, 2019
724ccf6
Remove unused imports from CommandLineUtils.scala, KafkaConfig.scala
dongjinleekr May 19, 2019
d3ad118
Add ignore case in KafkaController#process, GroupCoordinator#doSyncGr…
dongjinleekr May 19, 2019
a2ad4f6
Fix blind pattern matching in GroupCoordinator to explicit one
dongjinleekr May 22, 2019
37606da
Change Exception message for GroupCoordinator#[doSyncGroup, handleHea…
dongjinleekr May 24, 2019
54e32f8
Fix unexhaustive match case in KafkaController#process
dongjinleekr May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/src/main/scala/kafka/controller/KafkaController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,6 +1602,8 @@ class KafkaController(val config: KafkaConfig,
processIsrChangeNotification()
case Startup =>
processStartup()
case ShutdownEventThread =>
// not handled here

@ijuma ijuma May 24, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we throw an exception here too?

@dongjinleekr dongjinleekr May 24, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I have been still thinking about it; If we need an Exception, I will apply it in next cleanup. @abbccdda Could you tell me your opinion?

@ijuma ijuma May 24, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously we would throw an exception (MatchError) and now we ignore it. That seems worse, right?

@hachikuji hachikuji May 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right. I went ahead and merged because it was being addressed in #6686.

@ijuma ijuma May 24, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, we can just do it in #6686 then.

}
} catch {
case e: ControllerMovedException =>
Expand Down
6 changes: 6 additions & 0 deletions core/src/main/scala/kafka/coordinator/group/GroupCoordinator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,9 @@ class GroupCoordinator(val brokerId: Int,
val memberMetadata = group.get(memberId)
responseCallback(memberMetadata.assignment, Errors.NONE)
completeAndScheduleNextHeartbeatExpiration(group, group.get(memberId))

case Dead =>
throw new IllegalStateException(s"Reached unexpected condition for Dead group ${group.groupId}")
}
}
}
Expand Down Expand Up @@ -533,6 +536,9 @@ class GroupCoordinator(val brokerId: Int,
val member = group.get(memberId)
completeAndScheduleNextHeartbeatExpiration(group, member)
responseCallback(Errors.NONE)

case Dead =>
throw new IllegalStateException(s"Reached unexpected condition for Dead group $groupId")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/kafka/server/KafkaConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import kafka.utils.CoreUtils
import kafka.utils.Implicits._
import org.apache.kafka.clients.CommonClientConfigs
import org.apache.kafka.common.Reconfigurable
import org.apache.kafka.common.config.ConfigDef.{ConfigKey, ValidList, Validator}
import org.apache.kafka.common.config.ConfigDef.{ConfigKey, ValidList}
import org.apache.kafka.common.config.internals.BrokerSecurityConfigs
import org.apache.kafka.common.config.{AbstractConfig, ConfigDef, ConfigException, SaslConfigs, SslClientAuth, SslConfigs, TopicConfig}
import org.apache.kafka.common.metrics.Sensor
Expand Down
1 change: 0 additions & 1 deletion core/src/main/scala/kafka/utils/CommandLineUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.Properties

import joptsimple.{OptionParser, OptionSet, OptionSpec}
import org.apache.kafka.common.utils.AppInfoParser

import scala.collection.Set

Expand Down
1 change: 0 additions & 1 deletion core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

package kafka.server

import java.nio.ByteBuffer
import java.util.{Collections, LinkedHashMap, Optional, Properties}
import java.util.concurrent.{Executors, Future, TimeUnit}

Expand Down