Skip to content

Commit

Permalink
support engine type and subdomain
Browse files Browse the repository at this point in the history
  • Loading branch information
@cxzl25
cxzl25 committed Mar 4, 2022
1 parent d8ec325 commit 302ae75
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 3 deletions.
11 changes: 10 additions & 1 deletion kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/ServiceControlCli.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import org.apache.curator.framework.CuratorFramework
import org.apache.curator.utils.ZKPaths

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
import org.apache.kyuubi.ha.HighAvailabilityConf._
import org.apache.kyuubi.ha.client.{ServiceDiscovery, ServiceNodeInfo, ZooKeeperClientProvider}
Expand Down Expand Up @@ -227,7 +229,14 @@ object ServiceControlCli extends CommandLineUtils with Logging {
case ServiceControlObject.SERVER =>
ZKPaths.makePath(null, args.cliArgs.namespace)
case ServiceControlObject.ENGINE =>
ZKPaths.makePath(s"${args.cliArgs.namespace}_${ShareLevel.USER}", args.cliArgs.user)
val engineType = Some(args.cliArgs.engineType)
.filter(_ != null).filter(_.nonEmpty)
.getOrElse(args.conf.get(ENGINE_TYPE))
val engineSubdomain = Some(args.cliArgs.engineSubdomain)
.filter(_ != null).filter(_.nonEmpty)
.getOrElse(args.conf.get(ENGINE_SHARE_LEVEL_SUBDOMAIN).getOrElse("default"))
ZKPaths.makePath(s"${args.cliArgs.namespace}_${ShareLevel.USER}_${engineType}",
args.cliArgs.user, engineSubdomain)
}
}

Expand Down
14 changes: 14 additions & 0 deletions kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/ServiceControlCliArguments.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ class ServiceControlCliArguments(args: Seq[String], env: Map[String, String] = s
.action((v, c) => c.copy(user = v))
.text("The user name this engine belong to.")

val engineTypeOps = opt[String]("engine-type").abbr("et")
.action((v, c) => c.copy(engineType = v))
.text("The engine type this engine belong to.")

val engineSubdomainOps = opt[String]("engine-subdomain").abbr("es")
.action((v, c) => c.copy(engineSubdomain = v))
.text("The engine subdomain this engine belong to.")

val serverCmd =
cmd("server").action((_, c) => c.copy(service = ServiceControlObject.SERVER))
val engineCmd =
Expand All @@ -92,6 +100,8 @@ class ServiceControlCliArguments(args: Seq[String], env: Map[String, String] = s
serverCmd.text("\tGet Kyuubi server info of domain"),
engineCmd
.children(userOps)
.children(engineTypeOps)
.children(engineSubdomainOps)
.text("\tGet Kyuubi engine info belong to a user.")),
note(""),
cmd("delete")
Expand All @@ -101,6 +111,8 @@ class ServiceControlCliArguments(args: Seq[String], env: Map[String, String] = s
serverCmd.text("\tDelete the specified service node for a domain"),
engineCmd
.children(userOps)
.children(engineTypeOps)
.children(engineSubdomainOps)
.text("\tDelete the specified engine node for user.")),
note(""),
cmd("list")
Expand All @@ -110,6 +122,8 @@ class ServiceControlCliArguments(args: Seq[String], env: Map[String, String] = s
serverCmd.text("\tList all the service nodes for a particular domain"),
engineCmd
.children(userOps)
.children(engineTypeOps)
.children(engineSubdomainOps)
.text("\tList all the engine nodes for a user")),
checkConfig(f => {
if (f.action == null) failure("Must specify action command: [create|get|delete|list].")
Expand Down
4 changes: 3 additions & 1 deletion kyuubi-ctl/src/main/scala/org/apache/kyuubi/ctl/ServiceControlCliArgumentsParser.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ abstract private[kyuubi] class ServiceControlCliArgumentsParser {
host: String = null,
port: String = null,
version: String = null,
verbose: Boolean = false)
verbose: Boolean = false,
engineType: String = null,
engineSubdomain: String = null)

/**
* Cli arguments parse rules.
Expand Down
17 changes: 17 additions & 0 deletions kyuubi-ctl/src/test/scala/org/apache/kyuubi/ctl/ServiceControlCliArgumentsSuite.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ class ServiceControlCliArgumentsSuite extends KyuubiFunSuite {
}
thread.start()
thread.join()
// scalastyle:off println
println(logAppender.loggingEvents)
println("------")
println(searchString)
// scalastyle:on println
assert(logAppender.loggingEvents.exists(
_.getMessage.getFormattedMessage.contains(searchString)))
}
Expand Down Expand Up @@ -375,6 +380,10 @@ class ServiceControlCliArgumentsSuite extends KyuubiFunSuite {
|Command: get engine
|${"\t"}Get Kyuubi engine info belong to a user.
| -u, --user <value> The user name this engine belong to.
| -et, --engine-type <value>
| The engine type this engine belong to.
| -es, --engine-subdomain <value>
| The engine subdomain this engine belong to.
|
|Command: delete [server|engine] [options]
|${"\t"}Delete the specified service/engine node, host and port needed.
Expand All @@ -383,6 +392,10 @@ class ServiceControlCliArgumentsSuite extends KyuubiFunSuite {
|Command: delete engine
|${"\t"}Delete the specified engine node for user.
| -u, --user <value> The user name this engine belong to.
| -et, --engine-type <value>
| The engine type this engine belong to.
| -es, --engine-subdomain <value>
| The engine subdomain this engine belong to.
|
|Command: list [server|engine] [options]
|${"\t"}List all the service/engine nodes for a particular domain.
Expand All @@ -391,6 +404,10 @@ class ServiceControlCliArgumentsSuite extends KyuubiFunSuite {
|Command: list engine
|${"\t"}List all the engine nodes for a user
| -u, --user <value> The user name this engine belong to.
| -et, --engine-type <value>
| The engine type this engine belong to.
| -es, --engine-subdomain <value>
| The engine subdomain this engine belong to.
|
| -h, --help Show help message and exit.""".stripMargin

Expand Down
64 changes: 63 additions & 1 deletion kyuubi-ctl/src/test/scala/org/apache/kyuubi/ctl/ServiceControlCliSuite.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ class ServiceControlCliSuite extends KyuubiFunSuite with TestPrematureExit {
namespace,
"--user",
user)
assert(getZkNamespace(new ServiceControlCliArguments(arg2)) == s"/${namespace}_USER/$user")
assert(getZkNamespace(new ServiceControlCliArguments(arg2)) ==
s"/${namespace}_USER_SPARK_SQL/$user/default")
}

test("test list zk service nodes info") {
Expand Down Expand Up @@ -404,4 +405,65 @@ class ServiceControlCliSuite extends KyuubiFunSuite with TestPrematureExit {
testPrematureExit(args, getRenderedNodesInfoWithoutTitle(expectedNodes, true))
}
}

test("test get zk namespace for different engine type and subdomain") {
val arg1 = Array(
"list",
"engine",
"--zk-quorum",
zkServer.getConnectString,
"--namespace",
namespace,
"--user",
user)
assert(getZkNamespace(new ServiceControlCliArguments(arg1)) ==
s"/${namespace}_USER_SPARK_SQL/$user/default")

val arg2 = Array(
"list",
"engine",
"--zk-quorum",
zkServer.getConnectString,
"--namespace",
namespace,
"--user",
user,
"--engine-type",
"FLINK_SQL"
)
assert(getZkNamespace(new ServiceControlCliArguments(arg2)) ==
s"/${namespace}_USER_FLINK_SQL/$user/default")

val arg3 = Array(
"list",
"engine",
"--zk-quorum",
zkServer.getConnectString,
"--namespace",
namespace,
"--user",
user,
"--engine-type",
"TRINO"
)
assert(getZkNamespace(new ServiceControlCliArguments(arg3)) ==
s"/${namespace}_USER_TRINO/$user/default")

val arg4 = Array(
"list",
"engine",
"--zk-quorum",
zkServer.getConnectString,
"--namespace",
namespace,
"--user",
user,
"--engine-type",
"SPARK_SQL",
"--engine-subdomain",
"sub_1"
)
assert(getZkNamespace(new ServiceControlCliArguments(arg1)) ==
s"/${namespace}_USER_SPARK_SQL/$user/default")
}
}

0 comments on commit 302ae75

Please sign in to comment.