[KYUUBI #671] Refine WithKyuubiServerWithMiniYarnService

<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/NetEase/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->
Better readable.

### _How was this patch tested?_
Pass CI.

Closes #671 from ulysses-you/refine-mini-yarn.

Closes #671

3a8cfa27 [ulysses-you] improve
4f670619 [ulysses-you] improve
2688d1ab [ulysses-you] refine

Authored-by: ulysses-you <ulyssesyou18@gmail.com>
Signed-off-by: Cheng Pan <379377944@qq.com>
This commit is contained in:
ulysses-you 2021-06-08 21:25:24 +08:00 committed by Cheng Pan
parent ee74480737
commit b9079b698d
3 changed files with 10 additions and 5 deletions

View File

@ -22,7 +22,12 @@ import org.apache.kyuubi.config.internal.Tests.TESTING_HADOOP_CONF_DIR
import org.apache.kyuubi.server.MiniYarnService
import org.apache.kyuubi.util.KyuubiHadoopUtils
trait WithKyuubiServerWithMiniYarnService extends WithKyuubiServer {
/**
* To developers:
* You should specify JAVA_HOME before running test with mini yarn server. Otherwise the error
* may be thrown `/bin/bash: /bin/java: No such file or directory`.
*/
trait WithKyuubiServerOnYarn extends WithKyuubiServer {
protected val kyuubiServerConf: KyuubiConf
protected val connectionConf: Map[String, String]
private var miniYarnService: MiniYarnService = _

View File

@ -19,11 +19,11 @@ package org.apache.kyuubi.engine
import java.util.concurrent.CountDownLatch
import org.apache.kyuubi.{KyuubiSQLException, WithKyuubiServerWithMiniYarnService}
import org.apache.kyuubi.{KyuubiSQLException, WithKyuubiServerOnYarn}
import org.apache.kyuubi.config.KyuubiConf
import org.apache.kyuubi.operation.JDBCTestUtils
class EngineSubmitSuite extends WithKyuubiServerWithMiniYarnService with JDBCTestUtils {
class EngineSubmitSuite extends WithKyuubiServerOnYarn with JDBCTestUtils {
override protected def jdbcUrl: String = getJdbcUrl
override protected val kyuubiServerConf: KyuubiConf = KyuubiConf()
override protected val connectionConf: Map[String, String] = {

View File

@ -17,11 +17,11 @@
package org.apache.kyuubi.operation
import org.apache.kyuubi.WithKyuubiServerWithMiniYarnService
import org.apache.kyuubi.WithKyuubiServerOnYarn
import org.apache.kyuubi.config.KyuubiConf
import org.apache.kyuubi.config.KyuubiConf.ENGINE_INIT_TIMEOUT
class KyuubiOperationYarnClusterSuite extends WithKyuubiServerWithMiniYarnService
class KyuubiOperationYarnClusterSuite extends WithKyuubiServerOnYarn
with JDBCTestUtils {
override protected val kyuubiServerConf: KyuubiConf = {