use short sleep

zhaohehuhu · Feb 4, 2024 · b39c9b3 · b39c9b3
1 parent 7c123f6
commit b39c9b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/...yuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala b/...yuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
@@ -129,7 +129,7 @@ case class SparkSQLEngine(spark: SparkSession) extends Serverable("SparkSQLEngin
         info(s"Spark engine is de-registering from engine discovery space.")
         frontendServices.flatMap(_.discoveryService).foreach(_.stop())
         while (backendService.sessionManager.getOpenSessionCount > 0) {
-          Thread.sleep(1000 * 60)
+          Thread.sleep(TimeUnit.SECONDS.toMillis(5))
         }
         info(s"Spark engine has no open session now, terminating.")
         stop()

diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceDiscovery.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/ServiceDiscovery.scala
@@ -17,7 +17,7 @@
 
 package org.apache.kyuubi.ha.client
 
-import java.util.concurrent.CountDownLatch
+import java.util.concurrent.{CountDownLatch, TimeUnit}
 import java.util.concurrent.atomic.AtomicBoolean
 
 import org.apache.kyuubi.Logging
@@ -68,7 +68,7 @@ abstract class ServiceDiscovery(
   def stopGracefully(isLost: Boolean = false): Unit = {
     while (fe.be.sessionManager.getOpenSessionCount > 0) {
       info(s"${fe.be.sessionManager.getOpenSessionCount} connection(s) are active, delay shutdown")
-      Thread.sleep(1000 * 60)
+      Thread.sleep(TimeUnit.SECONDS.toMillis(5))
     }
     isServerLost.set(isLost)
     gracefulShutdownLatch.countDown()

diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/etcd/EtcdDiscoveryClient.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/etcd/EtcdDiscoveryClient.scala
@@ -63,7 +63,6 @@ class EtcdDiscoveryClient(conf: KyuubiConf) extends DiscoveryClient {
   var lockClient: Lock = _
   var leaseClient: Lease = _
   var serviceNode: ServiceNode = _
-  var serviceDiscovery: ServiceDiscovery = _
 
   var leaseTTL: Long = _
 
@@ -158,7 +157,7 @@ class EtcdDiscoveryClient(conf: KyuubiConf) extends DiscoveryClient {
   }
 
   override def monitorState(serviceDiscovery: ServiceDiscovery): Unit = {
-    this.serviceDiscovery = serviceDiscovery
+    // not need with etcd
   }
 
   override def tryWithLock[T](
@@ -277,10 +276,6 @@ class EtcdDiscoveryClient(conf: KyuubiConf) extends DiscoveryClient {
       }
       serviceNode = null
     }
-    if (serviceDiscovery != null) {
-      serviceDiscovery.stopGracefully(true)
-      serviceDiscovery = null
-    }
   }
 
   override def postDeregisterService(namespace: String): Boolean = {