cmccabe commented on code in PR #13089: URL: https://github.com/apache/kafka/pull/13089#discussion_r1067367679
########## server-common/src/main/java/org/apache/kafka/queue/KafkaEventQueue.java: ########## @@ -116,33 +116,33 @@ boolean isSingleton() { /** * Run the event associated with this EventContext. */ - void run(Logger log) throws InterruptedException { - try { - event.run(); - } catch (InterruptedException e) { - throw e; - } catch (Exception e) { + boolean run(Logger log, Throwable exceptionToDeliver) { + if (exceptionToDeliver == null) { try { - event.handleException(e); - } catch (Throwable t) { - log.error("Unexpected exception in handleException", t); + event.run(); + } catch (InterruptedException e) { + log.warn("Interrupted while running event. Shutting down event queue"); + return true; + } catch (Throwable e) { + exceptionToDeliver = e; } } - } - - /** - * Complete the event associated with this EventContext with a timeout exception. - */ - void completeWithTimeout() { - completeWithException(new TimeoutException()); + if (exceptionToDeliver != null) { + completeWithException(log, exceptionToDeliver); + } + return Thread.currentThread().isInterrupted(); } /** * Complete the event associated with this EventContext with the specified * exception. */ - void completeWithException(Throwable t) { - event.handleException(t); + void completeWithException(Logger log, Throwable t) { + try { + event.handleException(t); Review Comment: OK, but it needs to be at DEBUG level (since usually we don't want this, since it should be logged in handleException.) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org