From 3b72f8fa98c6975dab28640814dde2c28e1c5e2d Mon Sep 17 00:00:00 2001 From: Paul <11972871+tladus-git@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:42:43 +0900 Subject: [PATCH] =?UTF-8?q?[NDAP-1966][Fix]=20ZK=20path=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=20=EC=97=90=EB=9F=AC.=20(#9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: paul --- .../apache/kyuubi/server/api/v1/AdminResource.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/AdminResource.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/AdminResource.scala index 962021d5fc9..afb4065b6c8 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/AdminResource.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/AdminResource.scala @@ -376,8 +376,9 @@ private[v1] class AdminResource extends ApiRequestContext with Logging { s"share level: $shareLevel, subdomain: $subdomain") case None => discoveryClient.getChildren(engineSpace).map { child => - info(s"Listing engine nodes under $engineSpace/$child") - engineNodes ++= discoveryClient.getServiceNodesInfo(s"$engineSpace/$child").map(node => + val path = DiscoveryPaths.makePath(engineSpace, child, null) + info(s"Listing engine nodes under $path") + engineNodes ++= discoveryClient.getServiceNodesInfo(path).map(node => makeEngineInfo( child, engine.getVersion, @@ -450,7 +451,11 @@ private[v1] class AdminResource extends ApiRequestContext with Logging { } private def generateEngineSpace(engine: Engine): String = { - s"${engine.getNamespace}_${engine.getVersion}_${engine.getSharelevel}_${engine.getEngineType}" + val engineSpace = { + s"${engine.getNamespace}_${engine.getVersion}_${engine.getSharelevel}_${engine.getEngineType}" + } + + DiscoveryPaths.makePath(engineSpace, null, null) } private def calculateEngineSpace(engine: Engine): String = {