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 e5aa7294b..793b98d7c 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 @@ -65,8 +65,10 @@ case class SparkSQLEngine(spark: SparkSession) extends Serverable("SparkSQLEngin } override def stop(): Unit = { - eventLogging.onEvent( - engineStatus.copy(state = ServiceState.STOPPED.id, endTime = System.currentTimeMillis())) + if (!state.equals(ServiceState.LATENT)) { + eventLogging.onEvent( + engineStatus.copy(state = ServiceState.STOPPED.id, endTime = System.currentTimeMillis())) + } super.stop() } @@ -150,7 +152,9 @@ object SparkSQLEngine extends Logging { currentEngine.foreach { engine => val status = engine.engineStatus.copy(diagnostic = s"Error State SparkSQL Engine ${t.getMessage}") - EventLoggingService.onEvent(status) + if (!engine.getServiceState.equals(ServiceState.LATENT)) { + EventLoggingService.onEvent(status) + } error(status, t) engine.stop() } diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/EngineEvent.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/EngineEvent.scala index b90b873d8..789b91bbc 100644 --- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/EngineEvent.scala +++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/events/EngineEvent.scala @@ -98,13 +98,18 @@ object EngineEvent { val webUrl = sc.getConf.getOption( "spark.org.apache.hadoop.yarn.server.webproxy.amfilter.AmIpFilter.param.PROXY_URI_BASES") .orElse(sc.uiWebUrl).getOrElse("") + val connectionUrl = if (engine.getServiceState.equals(ServiceState.LATENT)) { + null + } else { + engine.connectionUrl + } new EngineEvent( sc.applicationId, sc.applicationAttemptId, sc.appName, sc.sparkUser, engine.getConf.get(ENGINE_SHARE_LEVEL), - engine.connectionUrl, + connectionUrl, sc.master, sc.version, webUrl,