Skip to content
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

fix: safely completing doClose() (#818) #1

Merged
merged 1 commit into from
Aug 15, 2024
Merged

fix: safely completing doClose() (#818) #1

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
48 changes: 35 additions & 13 deletions .../main/java/io/confluent/parallelconsumer/internal/AbstractParallelEoSStreamProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,25 @@ private void waitForClose(Duration timeout) throws TimeoutException, ExecutionEx
}

private void doClose(Duration timeout) throws TimeoutException, ExecutionException, InterruptedException {
// fixes github issue #809 - ensure doClose() state transition to CLOSED
// by catching unhandled exceptions in subsystems during close
try {
innerDoClose(timeout);
} catch (Exception e) {
log.error("exception during close", e);
throw e;
} finally {
deregisterMeters();
pcMetrics.close();
log.debug("Close complete.");
this.state = CLOSED;
if (this.getFailureCause() != null) {
log.error("PC closed due to error: {}", getFailureCause(), null);
}
}
}

private void innerDoClose(Duration timeout) throws TimeoutException, ExecutionException, InterruptedException {
log.debug("Starting close process (state: {})...", state);

// Drain and pause polling - keeps consumer alive for later commit, but paused
Expand Down Expand Up @@ -678,23 +697,26 @@ private void doClose(Duration timeout) throws TimeoutException, ExecutionExcepti
if (Thread.currentThread().isInterrupted()) {
log.warn("control thread interrupted - may lead to issues with transactional commit lock acquisition");
}
commitOffsetsThatAreReady();

try {
commitOffsetsThatAreReady();
} catch (Exception e) {
log.warn("failed to commit during close sequence", e);
}
// only close consumer once producer has committed it's offsets (tx'l)
log.debug("Closing and waiting for broker poll system...");
brokerPollSubsystem.closeAndWait();
try {
brokerPollSubsystem.closeAndWait();
} catch (Exception e) {
log.warn("failed to close brokerPollSubsystem during close sequence", e);
}

maybeCloseConsumer();
try {
maybeCloseConsumer();
} catch (Exception e) {
log.warn("failed to maybeCloseConsumer during close sequence", e);
}

producerManager.ifPresent(x -> x.close(timeout));
deregisterMeters();
pcMetrics.close();
log.debug("Close complete.");
this.state = CLOSED;

if (this.getFailureCause() != null) {
log.error("PC closed due to error: {}", getFailureCause(), null);
}
}

/**
Expand Down Expand Up @@ -1482,4 +1504,4 @@ private void clearCommitCommand() {
}
}

}
}