This is an automated email from the ASF dual-hosted git repository.
shenwenbing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 42407f7f2e 1. rename client highPriorityTaskExecutor (#4496)
42407f7f2e is described below
commit 42407f7f2eff82f168a172b1645389cf8dffeac1
Author: wenbingshen <[email protected]>
AuthorDate: Mon Sep 2 21:14:44 2024 +0800
1. rename client highPriorityTaskExecutor (#4496)
2. shutdownNow when not shutdown cleanly
---
.../src/main/java/org/apache/bookkeeper/client/BookKeeper.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
index 978d5355eb..40d6691390 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
@@ -428,7 +428,7 @@ public class BookKeeper implements
org.apache.bookkeeper.client.api.BookKeeper {
// initialize resources
this.scheduler =
OrderedScheduler.newSchedulerBuilder().numThreads(1).name("BookKeeperClientScheduler").build();
this.highPriorityTaskExecutor =
-
OrderedScheduler.newSchedulerBuilder().numThreads(1).name("BookKeeperWatchTaskScheduler").build();
+
OrderedScheduler.newSchedulerBuilder().numThreads(1).name("BookKeeperHighPriorityThread").build();
this.mainWorkerPool = OrderedExecutor.newBuilder()
.name("BookKeeperClientWorker")
.numThreads(conf.getNumWorkerThreads())
@@ -1472,7 +1472,8 @@ public class BookKeeper implements
org.apache.bookkeeper.client.api.BookKeeper {
// Close the watchTask scheduler
highPriorityTaskExecutor.shutdown();
if (!highPriorityTaskExecutor.awaitTermination(10, TimeUnit.SECONDS)) {
- LOG.warn("The highPriorityTaskExecutor for WatchTask did not
shutdown cleanly");
+ LOG.warn("The highPriorityTaskExecutor for WatchTask did not
shutdown cleanly, interrupting");
+ highPriorityTaskExecutor.shutdownNow();
}
mainWorkerPool.shutdown();