Set daemon thread to fix jvm not exit (#2698) (#2699)

pingcap · May 8, 2023 · 3429215 · 3429215
1 parent fcda956
commit 3429215
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/src/main/scala/com/pingcap/tispark/safepoint/ServiceSafePoint.scala b/core/src/main/scala/com/pingcap/tispark/safepoint/ServiceSafePoint.scala
@@ -22,6 +22,7 @@ import com.pingcap.tikv.TiSession
 import com.pingcap.tikv.exception.TiInternalException
 import com.pingcap.tikv.meta.TiTimestamp
 import com.pingcap.tikv.util.{BackOffer, ConcreteBackOffer}
+import com.google.common.util.concurrent.ThreadFactoryBuilder
 import org.slf4j.LoggerFactory
 
 import java.util.concurrent.{Executors, ScheduledExecutorService, TimeUnit}
@@ -34,7 +35,8 @@ case class ServiceSafePoint(
 
   private final val logger = LoggerFactory.getLogger(getClass.getName)
   private var minStartTs = Long.MaxValue
-  val service: ScheduledExecutorService = Executors.newSingleThreadScheduledExecutor()
+  val service: ScheduledExecutorService = Executors.newSingleThreadScheduledExecutor(
+    new ThreadFactoryBuilder().setNameFormat("serviceSafePoint-thread-%d").setDaemon(true).build)
   service.scheduleAtFixedRate(
     () => {
       if (minStartTs != Long.MaxValue) {

diff --git a/tikv-client/src/main/java/com/pingcap/tikv/TiSession.java b/tikv-client/src/main/java/com/pingcap/tikv/TiSession.java
@@ -241,7 +241,12 @@ public Map<String, Boolean> getStoreStatusCache() {
       synchronized (this) {
         if (storeStatusCache == null) {
           storeStatusCache = new ConcurrentHashMap<>();
-          storeStatusCacheExecutor = Executors.newScheduledThreadPool(1);
+          storeStatusCacheExecutor =
+              Executors.newSingleThreadScheduledExecutor(
+                  new ThreadFactoryBuilder()
+                      .setNameFormat("storeStatus-thread-%d")
+                      .setDaemon(true)
+                      .build());
           storeStatusCacheExecutor.scheduleAtFixedRate(
               () -> {
                 storeStatusCache.replaceAll(