feat(s3stream): wait for the background executor to close when shutti…

…ng down the S3 storage (#876) Signed-off-by: SSpirits <[email protected]>
AutoMQ · Jan 4, 2024 · d0ed716 · d0ed716
1 parent afb8e43
commit d0ed716
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/s3stream/src/main/java/com/automq/stream/s3/S3Storage.java b/s3stream/src/main/java/com/automq/stream/s3/S3Storage.java
@@ -258,6 +258,14 @@ public void shutdown() {
         }
         deltaWAL.shutdownGracefully();
         backgroundExecutor.shutdown();
+        try {
+            if (backgroundExecutor.awaitTermination(10, TimeUnit.SECONDS)) {
+                LOGGER.warn("await backgroundExecutor timeout 10s");
+            }
+        } catch (InterruptedException e) {
+            backgroundExecutor.shutdownNow();
+            LOGGER.warn("await backgroundExecutor close fail", e);
+        }
     }
 
     @Override

diff --git a/s3stream/src/main/java/com/automq/stream/s3/S3StreamClient.java b/s3stream/src/main/java/com/automq/stream/s3/S3StreamClient.java
@@ -169,6 +169,7 @@ public void shutdown() {
                 LOGGER.warn("await streamObjectCompactionExecutor timeout 10s");
             }
         } catch (InterruptedException e) {
+            streamObjectCompactionScheduler.shutdownNow();
             LOGGER.warn("await streamObjectCompactionExecutor close fail", e);
         }