diff --git a/.asf.yaml b/.asf.yaml index ec00d6db07a..2c4346295ec 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -30,6 +30,7 @@ github: - hive - sql - kubernetes + - hacktoberfest enabled_merge_buttons: squash: true merge: false diff --git a/.gitattributes b/.gitattributes index 6bbad541ac6..0df00fae260 100644 --- a/.gitattributes +++ b/.gitattributes @@ -26,6 +26,7 @@ NOTICE-binary export-ignore *.bat text eol=crlf *.cmd text eol=crlf *.java text eol=lf +*.md text eol=lf *.scala text eol=lf *.xml text eol=lf *.py text eol=lf diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala index 5f91bc73db5..ba84e1b1b3a 100644 --- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala +++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala @@ -376,7 +376,7 @@ object SparkSQLEngine extends Logging { case i: InterruptedException if !sparkSessionCreated.get => error( s"The Engine main thread was interrupted, possibly due to `createSpark` timeout." + - s" The `kyuubi.session.engine.initialize.timeout` is ($initTimeout ms) " + + s" The `${ENGINE_INIT_TIMEOUT.key}` is ($initTimeout ms) " + s" and submitted at $submitTime.", i) case t: Throwable => error(s"Failed to instantiate SparkSession: ${t.getMessage}", t) diff --git a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/IndividualSparkSuite.scala b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/IndividualSparkSuite.scala index c6789d14d2d..8fca1d0ca2b 100644 --- a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/IndividualSparkSuite.scala +++ b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/IndividualSparkSuite.scala @@ -114,7 +114,7 @@ class SparkEngineSuites extends KyuubiFunSuite { } assert(SparkSQLEngine.currentEngine.isEmpty) val errorMsg = s"The Engine main thread was interrupted, possibly due to `createSpark`" + - s" timeout. The `kyuubi.session.engine.initialize.timeout` is ($timeout ms) " + + s" timeout. The `${ENGINE_INIT_TIMEOUT.key}` is ($timeout ms) " + s" and submitted at $submitTime." assert(logAppender.loggingEvents.exists( _.getMessage.getFormattedMessage.equals(errorMsg))) diff --git a/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/spark/SparkOnKubernetesTestsSuite.scala b/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/spark/SparkOnKubernetesTestsSuite.scala index 3f591e604dc..09532efe3d1 100644 --- a/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/spark/SparkOnKubernetesTestsSuite.scala +++ b/integration-tests/kyuubi-kubernetes-it/src/test/scala/org/apache/kyuubi/kubernetes/test/spark/SparkOnKubernetesTestsSuite.scala @@ -27,7 +27,7 @@ import org.apache.hadoop.net.NetUtils import org.apache.kyuubi._ import org.apache.kyuubi.client.util.BatchUtils._ import org.apache.kyuubi.config.KyuubiConf -import org.apache.kyuubi.config.KyuubiConf.FRONTEND_THRIFT_BINARY_BIND_HOST +import org.apache.kyuubi.config.KyuubiConf._ import org.apache.kyuubi.engine.{ApplicationInfo, ApplicationManagerInfo, ApplicationOperation, KubernetesApplicationOperation} import org.apache.kyuubi.engine.ApplicationState.{FAILED, NOT_FOUND, RUNNING} import org.apache.kyuubi.engine.spark.SparkProcessBuilder @@ -57,9 +57,9 @@ abstract class SparkOnKubernetesSuiteBase .set("spark.driver.memory", "512M") .set("spark.kubernetes.driver.request.cores", "250m") .set("spark.kubernetes.executor.request.cores", "250m") - .set("kyuubi.kubernetes.context", "minikube") - .set("kyuubi.frontend.protocols", "THRIFT_BINARY,REST") - .set("kyuubi.session.engine.initialize.timeout", "PT10M") + .set(KUBERNETES_CONTEXT.key, "minikube") + .set(FRONTEND_PROTOCOLS.key, "THRIFT_BINARY,REST") + .set(ENGINE_INIT_TIMEOUT.key, "PT10M") } } diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala index e4382a859d2..012f4df1608 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala @@ -198,7 +198,7 @@ class KyuubiOperationYarnClusterSuite extends WithKyuubiServerOnYarn with HiveJD "spark.submit.deployMode" -> "cluster", "spark.sql.defaultCatalog=spark_catalog" -> "spark_catalog", "spark.sql.catalog.spark_catalog.type" -> "invalid_type", - "kyuubi.session.engine.initialize.timeout" -> "PT10M", + ENGINE_INIT_TIMEOUT.key -> "PT10M", KYUUBI_BATCH_ID_KEY -> UUID.randomUUID().toString))(Map.empty) { val startTime = System.currentTimeMillis() val exception = intercept[Exception] {