diff --git a/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/ServiceControlCli.scala b/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/ServiceControlCli.scala index 2585989a2..9cd92eecb 100644 --- a/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/ServiceControlCli.scala +++ b/kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/ServiceControlCli.scala @@ -19,7 +19,7 @@ package org.apache.kyuubi.ctl import scala.collection.mutable.ListBuffer -import org.apache.kyuubi.{KYUUBI_VERSION, Logging} +import org.apache.kyuubi.Logging import org.apache.kyuubi.config.KyuubiConf.ENGINE_SHARE_LEVEL_SUBDOMAIN import org.apache.kyuubi.config.KyuubiConf.ENGINE_TYPE import org.apache.kyuubi.engine.ShareLevel @@ -235,7 +235,7 @@ object ServiceControlCli extends CommandLineUtils with Logging { // The path of the engine defined in zookeeper comes from // org.apache.kyuubi.engine.EngineRef#engineSpace DiscoveryPaths.makePath( - s"${args.cliArgs.namespace}_${KYUUBI_VERSION}_${ShareLevel.USER}_${engineType}", + s"${args.cliArgs.namespace}_${args.cliArgs.version}_${ShareLevel.USER}_${engineType}", args.cliArgs.user, Array(engineSubdomain)) } diff --git a/kyuubi-ctl/src/test/scala/org/apache/kyuubi/ctl/ServiceControlCliSuite.scala b/kyuubi-ctl/src/test/scala/org/apache/kyuubi/ctl/ServiceControlCliSuite.scala index 0cae9d992..ac18520c3 100644 --- a/kyuubi-ctl/src/test/scala/org/apache/kyuubi/ctl/ServiceControlCliSuite.scala +++ b/kyuubi-ctl/src/test/scala/org/apache/kyuubi/ctl/ServiceControlCliSuite.scala @@ -460,5 +460,23 @@ class ServiceControlCliSuite extends KyuubiFunSuite with TestPrematureExit { "sub_1") assert(getZkNamespace(new ServiceControlCliArguments(arg4)) == s"/${namespace}_${KYUUBI_VERSION}_USER_SPARK_SQL/$user/sub_1") + + val arg5 = Array( + "list", + "engine", + "--zk-quorum", + zkServer.getConnectString, + "--namespace", + namespace, + "--version", + "1.5.0", + "--user", + user, + "--engine-type", + "SPARK_SQL", + "--engine-subdomain", + "sub_1") + assert(getZkNamespace(new ServiceControlCliArguments(arg5)) == + s"/${namespace}_1.5.0_USER_SPARK_SQL/$user/sub_1") } }