This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/branch-1.9 by this push:
new 304e222f9 Revert "[KYUUBI #6390] Temporarily disable UI Tab for Spark
4.0 and above"
304e222f9 is described below
commit 304e222f9f2a7a84a7ed93bacf1e932f70c9f4cb
Author: Cheng Pan <[email protected]>
AuthorDate: Tue May 21 22:24:09 2024 +0800
Revert "[KYUUBI #6390] Temporarily disable UI Tab for Spark 4.0 and above"
This reverts commit bd33b7b176cf11a647650798456f51c405de9f81.
---
.../apache/kyuubi/engine/spark/SparkSQLEngine.scala | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
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 c9011e73a..5ed67963b 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
@@ -27,7 +27,7 @@ import scala.util.control.NonFatal
import com.google.common.annotations.VisibleForTesting
import org.apache.hadoop.fs.Path
-import org.apache.spark.{ui, SPARK_VERSION, SparkConf}
+import org.apache.spark.{ui, SparkConf}
import org.apache.spark.kyuubi.{SparkContextHelper,
SparkSQLEngineEventListener, SparkSQLEngineListener}
import org.apache.spark.kyuubi.SparkUtilsHelper.getLocalDir
import org.apache.spark.sql.SparkSession
@@ -46,7 +46,7 @@ import org.apache.kyuubi.ha.HighAvailabilityConf._
import org.apache.kyuubi.ha.client.RetryPolicies
import org.apache.kyuubi.service.Serverable
import org.apache.kyuubi.session.SessionHandle
-import org.apache.kyuubi.util.{SemanticVersion, SignalRegister, ThreadUtils}
+import org.apache.kyuubi.util.{SignalRegister, ThreadUtils}
import
org.apache.kyuubi.util.ThreadUtils.scheduleTolerableRunnableWithFixedDelay
case class SparkSQLEngine(spark: SparkSession) extends
Serverable("SparkSQLEngine") {
@@ -358,15 +358,11 @@ object SparkSQLEngine extends Logging {
engine.start()
val kvStore = SparkContextHelper.getKvStore(spark.sparkContext)
val store = new EngineEventsStore(kvStore)
- if (SemanticVersion(SPARK_VERSION) >= "4.0") {
- warn("Kyuubi UI does not support Spark 4.0 and above yet")
- } else {
- ui.EngineTab(
- Some(engine),
- SparkContextHelper.getSparkUI(spark.sparkContext),
- store,
- kyuubiConf)
- }
+ ui.EngineTab(
+ Some(engine),
+ SparkContextHelper.getSparkUI(spark.sparkContext),
+ store,
+ kyuubiConf)
val event = EngineEvent(engine)
info(event)
EventBus.post(event)
