ut

Author: pan3793

kyuubi-server/src/test/scala/org/apache/kyuubi/WithKyuubiServerOnYarn.scala

@@ -17,6 +17,8 @@
 
 package org.apache.kyuubi
 
+import java.util.UUID
+
 import scala.collection.JavaConverters._
 import scala.concurrent.duration._
 
@@ -104,7 +106,10 @@ class KyuubiOperationYarnClusterSuite extends WithKyuubiServerOnYarn with HiveJD
 
   test("open batch session") {
     val batchRequest =
-      newSparkBatchRequest(Map("spark.master" -> "local", "spark.executor.instances" -> "1"))
+      newSparkBatchRequest(Map(
+        "spark.master" -> "local",
+        "spark.executor.instances" -> "1",
+        "kyuubi.batch.id" -> UUID.randomUUID().toString))
 
     val sessionHandle = sessionManager.openBatchSession(
       "kyuubi",
@@ -162,7 +167,9 @@ class KyuubiOperationYarnClusterSuite extends WithKyuubiServerOnYarn with HiveJD
   }
 
   test("prevent dead loop if the batch job submission process it not alive") {
-    val batchRequest = newSparkBatchRequest(Map("spark.submit.deployMode" -> "invalid"))
+    val batchRequest = newSparkBatchRequest(Map(
+      "spark.submit.deployMode" -> "invalid",
+      "kyuubi.batch.id" -> UUID.randomUUID().toString))
 
     val sessionHandle = sessionManager.openBatchSession(
       "kyuubi",
@@ -188,7 +195,8 @@ 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"))(Map.empty) {
+      "kyuubi.session.engine.initialize.timeout" -> "PT10M",
+      "kyuubi.batch.id" -> UUID.randomUUID().toString))(Map.empty) {
       val startTime = System.currentTimeMillis()
       val exception = intercept[Exception] {
         withJdbcStatement() { _ => }

kyuubi-server/src/test/scala/org/apache/kyuubi/events/handler/ServerJsonLoggingEventHandlerSuite.scala

@@ -138,7 +138,7 @@ class ServerJsonLoggingEventHandlerSuite extends WithKyuubiServer with HiveJDBCT
       Utils.currentUser,
       "kyuubi",
       "127.0.0.1",
-      Map.empty,
+      Map("kyuubi.batch.id" -> UUID.randomUUID().toString),
       batchRequest)
     withSessionConf()(Map.empty)(Map("spark.sql.shuffle.partitions" -> "2")) {
       withJdbcStatement() { statement =>