Skip to content

[7.17] Fix cancellation order in CancellableRateLimitedFluxIterator (#104259) #104263

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
merged 1 commit into from
Jan 11, 2024
Merged

[7.17] Fix cancellation order in CancellableRateLimitedFluxIterator (#104259) #104263

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions docs/changelog/104259.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 104259
summary: Fix cancellation order in `CancellableRateLimitedFluxIterator`
area: Snapshot/Restore
type: bug
issues:
- 103054
4 changes: 2 additions & 2 deletions ...rc/main/java/org/elasticsearch/repositories/azure/CancellableRateLimitedFluxIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ public void onNext(T element) {
}

public void cancel() {
done = true;
cancelSubscription();
clearQueue();
done = true;
// cancel should be called from the consumer
// thread, but to avoid potential deadlocks
// we just try to release a possibly blocked
Expand All @@ -178,9 +178,9 @@ public void cancel() {

@Override
public void onError(Throwable t) {
done = true;
clearQueue();
error = t;
done = true;
signalConsumer();
}

Expand Down