(flink) branch master updated: [FLINK-36714][state] Ignore interrupted in sstmerge.CompactionScheduler#stop

[pnowojski]

This is an automated email from the ASF dual-hosted git repository.

pnowojski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new b48ccce1ce2 [FLINK-36714][state] Ignore interrupted in 
sstmerge.CompactionScheduler#stop
b48ccce1ce2 is described below

commit b48ccce1ce201ea76e11f089f43e8c115b96a992
Author: Roman Khachatryan <khachatryan.ro...@gmail.com>
AuthorDate: Wed Sep 18 10:46:07 2024 +0200

    [FLINK-36714][state] Ignore interrupted in sstmerge.CompactionScheduler#stop
---
 .../org/apache/flink/state/rocksdb/sstmerge/CompactionScheduler.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/sstmerge/CompactionScheduler.java
 
b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/sstmerge/CompactionScheduler.java
index 1987b5d4cd3..f4ce165d1ac 100644
--- 
a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/sstmerge/CompactionScheduler.java
+++ 
b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/sstmerge/CompactionScheduler.java
@@ -28,6 +28,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Collections.emptyList;
+import static 
org.apache.flink.shaded.guava32.com.google.common.util.concurrent.Uninterruptibles.awaitTerminationUninterruptibly;
 
 /**
  * Schedules manual compactions of small disjoint SST files created by 
RocksDB. It does so
@@ -88,7 +89,7 @@ class CompactionScheduler {
                 scheduledExecutor.shutdownNow();
             }
         }
-        if (!scheduledExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
+        if (!awaitTerminationUninterruptibly(scheduledExecutor, 5, 
TimeUnit.SECONDS)) {
             LOG.warn("Unable to terminate scheduled tasks in 5s");
         }
     }