Skip to content

Improve handling of interrupts in TrinoResultSet #14187

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
findepi merged 2 commits into from
Sep 20, 2022
Merged

Improve handling of interrupts in TrinoResultSet #14187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993e6ba
Mark internal method as private and give better name
findepi Sep 17, 2022
3e01a3e
Improve handling of interrupts in TrinoResultSet
findepi Sep 19, 2022
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
27 changes: 12 additions & 15 deletions client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ public AsyncIterator(Iterator<T> dataIterator, StatementClient client)
}
}
catch (InterruptedException e) {
interrupt(e);
client.close();
rowQueue.clear();
Copy link
Copy Markdown
Member

@losipiuk losipiuk Sep 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why does cleaning rowQueue here matter?

Copy link
Copy Markdown
Member Author

@findepi findepi Sep 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here it is probably not important. it's more like "why not?"

Copy link
Copy Markdown
Member Author

@findepi findepi Sep 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

discussed offline and agreed to keep

throw new RuntimeException(new SQLException("ResultSet thread was interrupted", e));
}
finally {
semaphore.release();
Expand All @@ -196,18 +198,6 @@ public void cancel()
{
cancelled = true;
future.cancel(true);
cleanup();
}

public void interrupt(InterruptedException e)
{
cleanup();
Thread.currentThread().interrupt();
throw new RuntimeException(new SQLException("ResultSet thread was interrupted", e));
}

private void cleanup()
{
// When thread interruption is mis-handled by underlying implementation of `client`, the thread which
// is working for `future` may be blocked by `rowQueue.put` (`rowQueue` is full) and will never finish
// its work. It is necessary to close `client` and drain `rowQueue` to avoid such leaks.
Expand All @@ -234,7 +224,7 @@ protected T computeNext()
semaphore.acquire();
}
catch (InterruptedException e) {
interrupt(e);
handleInterrupt(e);
}
if (rowQueue.isEmpty()) {
// If we got here and the queue is empty the thread fetching from the underlying iterator is done.
Expand All @@ -243,7 +233,7 @@ protected T computeNext()
future.get();
}
catch (InterruptedException e) {
interrupt(e);
handleInterrupt(e);
}
catch (ExecutionException e) {
throwIfUnchecked(e.getCause());
Expand All @@ -253,6 +243,13 @@ protected T computeNext()
}
return rowQueue.poll();
}

private void handleInterrupt(InterruptedException e)
{
cancel();
Thread.currentThread().interrupt();
throw new RuntimeException(new SQLException("Interrupted", e));
}
}

private static class ResultsPageIterator
Expand Down
2 changes: 1 addition & 1 deletion client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ public void testQueryCancelByInterrupt()
assertTrue(queryFinished.await(10, SECONDS));
assertThat(queryFailure.get())
.isInstanceOf(SQLException.class)
.hasMessage("ResultSet thread was interrupted");
.hasMessage("Interrupted");
assertEquals(getQueryState(queryId.get()), FAILED);
}

Expand Down