Skip to content

feat(shell): optimize shutdown hook #1330

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 1 commit into from
May 31, 2024
Merged

feat(shell): optimize shutdown hook #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 8 additions & 13 deletions automq-shell/src/main/java/com/automq/shell/log/LogUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,16 @@ public static LogUploader getInstance() {
return INSTANCE;
}

public void close() {
public void close() throws InterruptedException {
closed = true;
if (uploadThread != null) {
uploadThread.interrupt();
cleanupThread.interrupt();

if (uploadBuffer.readableBytes() > 0) {
try {
s3Operator.write(getObjectKey(), uploadBuffer, ThrottleStrategy.BYPASS).get();
} catch (Exception ignore) {
}
}
uploadThread.join();
s3Operator.close();
}

if (cleanupThread != null) {
cleanupThread.interrupt();
}
}

@Override
Expand Down Expand Up @@ -139,7 +135,6 @@ private void initUploadComponent() {
} catch (Exception e) {
LOGGER.error("Initialize log uploader failed", e);
}
Runtime.getRuntime().addShutdownHook(new Thread(this::close));
}, command -> new Thread(command).start());
}
}
Expand Down Expand Up @@ -183,7 +178,7 @@ public void run() {
upload(now);
}
uploadBuffer.writeBytes(bytes);
} else if (closed) {
} else if (closed && queue.isEmpty()) {
upload(now);
break;
} else if (now - lastUploadTimestamp > nextUploadInterval) {
Expand All @@ -201,7 +196,7 @@ private void upload(long now) {
if (uploadBuffer.readableBytes() > 0) {
if (couldUpload()) {
try {
while (!closed && !Thread.currentThread().isInterrupted()) {
while (!Thread.currentThread().isInterrupted()) {
if (s3Operator == null) {
break;
}
Expand Down
8 changes: 5 additions & 3 deletions core/src/main/scala/kafka/Kafka.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package kafka

import com.automq.shell.AutoMQApplication
import com.automq.shell.auth.{CredentialsProviderHolder, EnvVariableCredentialsProvider}
import com.automq.shell.log.S3LogConfig
import com.automq.shell.log.{LogUploader, S3LogConfig}
import com.automq.shell.model.S3Url
import com.automq.stream.s3.ByteBufAlloc
import joptsimple.OptionParser
Expand Down Expand Up @@ -162,8 +162,10 @@ object Kafka extends Logging {

// attach shutdown handler to catch terminating signals as well as normal termination
Exit.addShutdownHook("kafka-shutdown-hook", {
try server.shutdown()
catch {
try {
server.shutdown()
LogUploader.getInstance().close()
} catch {
case _: Throwable =>
fatal("Halting Kafka.")
// Calling exit() can lead to deadlock as exit() can be called multiple times. Force exit.
Expand Down