fix code

apache · Jan 18, 2024 · 085ffc5 · 085ffc5
1 parent d58e8ec
commit 085ffc5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/client/KyuubiSyncThriftClient.scala
@@ -42,7 +42,7 @@ import org.apache.kyuubi.util.{ThreadUtils, ThriftUtils}
 import org.apache.kyuubi.util.ThreadUtils.scheduleTolerableRunnableWithFixedDelay
 
 class KyuubiSyncThriftClient private (
-    hostPort: (String, Int),
+    val hostPort: (String, Int),
     protocol: TProtocol,
     engineAliveProbeProtocol: Option[TProtocol],
     engineAliveProbeInterval: Long,
@@ -53,7 +53,7 @@ class KyuubiSyncThriftClient private (
   @volatile private var _engineId: Option[String] = _
   @volatile private var _engineUrl: Option[String] = _
   @volatile private var _engineName: Option[String] = _
-  private[kyuubi] def engineHostPort: (String, Int) = hostPort
+  def engineHostPort: (String, Int) = hostPort
 
   private[kyuubi] def engineConnectionClosed: Boolean = !protocol.getTransport.isOpen
 

diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/EngineRef.scala
@@ -337,13 +337,11 @@ private[kyuubi] class EngineRef(
       }
     }
 
-  def getServiceNodes(
+  def getServiceNode(
       discoveryClient: DiscoveryClient,
       hostPort: (String, Int)): Option[ServiceNodeInfo] = {
-    tryWithLock(discoveryClient) {
-      val serviceNodes = discoveryClient.getServiceNodesInfo(engineSpace)
-      serviceNodes.filter { sn => (sn.host, sn.port) == hostPort }.headOption
-    }
+    val serviceNodes = discoveryClient.getServiceNodesInfo(engineSpace)
+    serviceNodes.filter { sn => (sn.host, sn.port) == hostPort }.headOption
   }
 
   def close(): Unit = {

diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/session/KyuubiSessionImpl.scala
@@ -122,7 +122,7 @@ class KyuubiSessionImpl(
 
   def getEngineNode: Option[ServiceNodeInfo] = {
     withDiscoveryClient(sessionConf) { discoveryClient =>
-      engine.getServiceNodes(discoveryClient, _client.engineHostPort)
+      engine.getServiceNode(discoveryClient, _client.engineHostPort)
     }
   }