Skip to content

KAFKA-15392: Prevent shadowing RestServer shutdown exceptions #14277

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
gharris1727 merged 3 commits into from
Aug 29, 2023
Merged

KAFKA-15392: Prevent shadowing RestServer shutdown exceptions #14277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5084cb4
KAFKA-15392: Prevent shadowing RestServer shutdown exceptions
gharris1727 Aug 22, 2023
c6974fd
fixup: RestServer#stop should be safe to call when already stopped or…
gharris1727 Aug 23, 2023
9a222bd
fixup: use closeQuietly
gharris1727 Aug 28, 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
14 changes: 13 additions & 1 deletion connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/RestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,13 @@ public void stop() {
log.info("Stopping REST server");

try {
if (handlers.isRunning()) {
for (Handler handler : handlers.getHandlers()) {
if (handler != null) {
Utils.closeQuietly(handler::stop, handler.toString());
}
}
}
for (ConnectRestExtension connectRestExtension : connectRestExtensions) {
try {
connectRestExtension.close();
Expand All @@ -358,8 +365,13 @@ public void stop() {
jettyServer.stop();
jettyServer.join();
} catch (Exception e) {
jettyServer.destroy();
throw new ConnectException("Unable to stop REST server", e);
} finally {
try {
jettyServer.destroy();
} catch (Exception e) {
log.error("Unable to destroy REST server", e);
}
}

log.info("REST server stopped");
Expand Down