Fix cancellation order in CancellableRateLimitedFluxIterator (#104259) (

#104263) Closes #103054
elastic · Jan 11, 2024 · f83dd8e · f83dd8e
1 parent 9923a87
commit f83dd8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/docs/changelog/104259.yaml b/docs/changelog/104259.yaml
@@ -0,0 +1,6 @@
+pr: 104259
+summary: Fix cancellation order in `CancellableRateLimitedFluxIterator`
+area: Snapshot/Restore
+type: bug
+issues:
+ - 103054
diff --git a/...rc/main/java/org/elasticsearch/repositories/azure/CancellableRateLimitedFluxIterator.java b/...rc/main/java/org/elasticsearch/repositories/azure/CancellableRateLimitedFluxIterator.java
@@ -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
@@ -178,9 +178,9 @@ public void cancel() {
 
     @Override
     public void onError(Throwable t) {
+        done = true;
         clearQueue();
         error = t;
-        done = true;
         signalConsumer();
     }