fix(issue2108): avoid blocking at the end of a compaction iteration w…

…hen there are un-uploaded data Signed-off-by: Shichao Nie <[email protected]>
AutoMQ · Nov 3, 2024 · e494613 · e494613
1 parent e9b2117
commit e494613
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/s3stream/src/main/java/com/automq/stream/s3/compact/CompactionManager.java b/s3stream/src/main/java/com/automq/stream/s3/compact/CompactionManager.java
@@ -744,14 +744,16 @@ void executeCompactionPlans(CommitStreamSetObjectRequest request, List<Compactio
                 }
                 // wait for all stream objects and stream set object part to be uploaded
                 compactionCf = CompletableFuture.allOf(cfList.toArray(new CompletableFuture[0]))
-                    .thenCompose(v -> uploader.forceUploadStreamSetObject())
-                    .exceptionally(ex -> {
-                        uploader.release().thenAccept(v -> {
-                            for (CompactedObject compactedObject : compactionPlan.compactedObjects()) {
-                                compactedObject.streamDataBlocks().forEach(StreamDataBlock::release);
-                            }
-                        }).join();
-                        throw new IllegalStateException("Error while uploading compaction objects", ex);
+                    .whenComplete((v, ex) -> {
+                        uploader.forceUploadStreamSetObject();
+                        if (ex != null) {
+                            logger.error("Error while uploading compaction objects", ex);
+                            uploader.release().thenAccept(vv -> {
+                                for (CompactedObject compactedObject : compactionPlan.compactedObjects()) {
+                                    compactedObject.streamDataBlocks().forEach(StreamDataBlock::release);
+                                }
+                            }).join();
+                        }
                     });
             }
             try {