Skip to content

HOTFIX: timeout issue in Remove thread #10321

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
ableegoldman merged 1 commit into from
Mar 16, 2021
Merged

HOTFIX: timeout issue in Remove thread #10321

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
5 changes: 2 additions & 3 deletions streams/src/main/java/org/apache/kafka/streams/KafkaStreams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,6 @@ public Optional<String> removeStreamThread(final Duration timeout) {
}

private Optional<String> removeStreamThread(final long timeoutMs) throws TimeoutException {
final long begin = time.milliseconds();
boolean timeout = false;
if (isRunningOrRebalancing()) {
synchronized (changeThreadCount) {
Expand All @@ -1044,7 +1043,7 @@ private Optional<String> removeStreamThread(final long timeoutMs) throws Timeout
streamThread.requestLeaveGroupDuringShutdown();
streamThread.shutdown();
if (!streamThread.getName().equals(Thread.currentThread().getName())) {
if (!streamThread.waitOnThreadState(StreamThread.State.DEAD, timeoutMs - begin)) {
if (!streamThread.waitOnThreadState(StreamThread.State.DEAD, timeoutMs)) {
log.warn("Thread " + streamThread.getName() + " did not shutdown in the allotted time");
timeout = true;
// Don't remove from threads until shutdown is complete. We will trim it from the
Expand All @@ -1066,7 +1065,7 @@ private Optional<String> removeStreamThread(final long timeoutMs) throws Timeout
new RemoveMembersFromConsumerGroupOptions(membersToRemove)
);
try {
removeMembersFromConsumerGroupResult.memberResult(memberToRemove).get(timeoutMs - begin, TimeUnit.MILLISECONDS);
removeMembersFromConsumerGroupResult.memberResult(memberToRemove).get(timeoutMs, TimeUnit.MILLISECONDS);
} catch (final java.util.concurrent.TimeoutException e) {
log.error("Could not remove static member {} from consumer group {} due to a timeout: {}",
groupInstanceID.get(), config.getString(StreamsConfig.APPLICATION_ID_CONFIG), e);
Expand Down