Skip to content

BaseWorkerClientImpl: Don't attempt to recover from a closed channel. #17052

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
gianm merged 8 commits into from
Sep 15, 2024
Merged

BaseWorkerClientImpl: Don't attempt to recover from a closed channel. #17052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c216ef4
BaseWorkerClientImpl: Don't attempt to recover from a closed channel.
gianm Sep 12, 2024
815f813
Merge branch 'master' into msq-workerclient-no-recovery-closed-channel
gianm Sep 13, 2024
da7321d
Add some test coverage.
gianm Sep 13, 2024
b1a236d
Merge branch 'master' into msq-workerclient-no-recovery-closed-channel
gianm Sep 13, 2024
e0b6af2
wip
gianm Sep 13, 2024
914f29d
Merge branch 'master' into msq-workerclient-no-recovery-closed-channel
gianm Sep 15, 2024
0d6fed0
Add test coverage.
gianm Sep 15, 2024
230c833
Style.
gianm Sep 15, 2024
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
19 changes: 13 additions & 6 deletions ...s-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import org.apache.druid.common.guava.FutureUtils;
import org.apache.druid.frame.channel.ChannelClosedForWritesException;
import org.apache.druid.frame.channel.ReadableByteChunksFrameChannel;
import org.apache.druid.frame.file.FrameFileHttpResponseHandler;
import org.apache.druid.frame.file.FrameFilePartialFetch;
Expand Down Expand Up @@ -219,12 +220,18 @@ public ListenableFuture<Boolean> fetchChannelData(
public void onSuccess(FrameFilePartialFetch partialFetch)
{
if (partialFetch.isExceptionCaught()) {
// Exception while reading channel. Recoverable.
log.noStackTrace().info(
partialFetch.getExceptionCaught(),
"Encountered exception while reading channel [%s]",
channel.getId()
);
if (partialFetch.getExceptionCaught() instanceof ChannelClosedForWritesException) {
// Channel was closed. Stop trying.
retVal.setException(partialFetch.getExceptionCaught());
return;
} else {
// Exception while reading channel. Recoverable.
log.noStackTrace().warn(
partialFetch.getExceptionCaught(),
"Attempting recovery after exception while reading channel[%s]",
channel.getId()
);
}
}

// Empty fetch means this is the last fetch for the channel.
Expand Down
Loading