Skip to content

feat: await partition shutdown #552

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
merged 2 commits into from
Dec 13, 2023
Merged

feat: await partition shutdown #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
581d6e7
feat: await partition shutdown
superhx Dec 13, 2023
bb63bc1
Merge branch 'develop' into feat_await_partition_shutdown
superhx Dec 13, 2023
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: 1 addition & 1 deletion core/src/main/scala/kafka/log/streamaspect/ElasticLogManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ object ElasticLogManager {
INSTANCE.get.newSegment(topicPartition, baseOffset, time, fileSuffix)
}

def shutdownNow(): Unit = {
def shutdown(): Unit = {
INSTANCE.foreach(_.shutdownNow())
}
}
2 changes: 0 additions & 2 deletions core/src/main/scala/kafka/server/BrokerServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,6 @@ class BrokerServer(
if (logManager != null)
CoreUtils.swallow(logManager.shutdown(), this)

CoreUtils.swallow(ElasticLogManager.shutdownNow(), this)

// log manager need clientToControllerChannelManager to send request to controller.
if (clientToControllerChannelManager != null)
CoreUtils.swallow(clientToControllerChannelManager.shutdown(), this)
Expand Down
6 changes: 5 additions & 1 deletion core/src/main/scala/kafka/server/ReplicaManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2769,8 +2769,12 @@ class ReplicaManager(val config: KafkaConfig,
info(s"try force stop partitions ${partitionsToClose.keys}")
stopPartitions(partitionsToClose)
}
checkAllPartitionClosed()
while (!checkAllPartitionClosed() && (System.currentTimeMillis() - start) < 30000) {
info("still has opening partition, retry check later")
Thread.sleep(1000)
}
info("await all partitions closed")
CoreUtils.swallow(ElasticLogManager.shutdown(), this)
}

def checkAllPartitionClosed(): Boolean = {
Expand Down