-
Notifications
You must be signed in to change notification settings - Fork 29.3k
[SPARK-24479][SS] Added config for registering streamingQueryListeners #21504
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 5 commits
d3a3baa
f721ebe
02b2973
421e16b
b87c90b
bbec6ce
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ import scala.collection.mutable | |
|
|
||
| import org.apache.hadoop.fs.Path | ||
|
|
||
| import org.apache.spark.SparkException | ||
| import org.apache.spark.annotation.InterfaceStability | ||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.sql.{AnalysisException, DataFrame, SparkSession} | ||
|
|
@@ -32,6 +33,7 @@ import org.apache.spark.sql.execution.streaming._ | |
| import org.apache.spark.sql.execution.streaming.continuous.{ContinuousExecution, ContinuousTrigger} | ||
| import org.apache.spark.sql.execution.streaming.state.StateStoreCoordinatorRef | ||
| import org.apache.spark.sql.internal.SQLConf | ||
| import org.apache.spark.sql.internal.StaticSQLConf.STREAMING_QUERY_LISTENERS | ||
| import org.apache.spark.sql.sources.v2.StreamWriteSupport | ||
| import org.apache.spark.util.{Clock, SystemClock, Utils} | ||
|
|
||
|
|
@@ -55,6 +57,19 @@ class StreamingQueryManager private[sql] (sparkSession: SparkSession) extends Lo | |
| @GuardedBy("awaitTerminationLock") | ||
| private var lastTerminatedQuery: StreamingQuery = null | ||
|
|
||
| try { | ||
| sparkSession.sparkContext.conf.get(STREAMING_QUERY_LISTENERS).foreach { classNames => | ||
| Utils.loadExtensions(classOf[StreamingQueryListener], classNames, | ||
| sparkSession.sparkContext.conf).foreach(listener => { | ||
| addListener(listener) | ||
| logInfo(s"Registered listener ${listener.getClass.getName}") | ||
| }) | ||
| } | ||
| } catch { | ||
| case e: Exception => | ||
| throw new SparkException("Exception when registering StreamingQueryListener", e) | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. two comments here:
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point. Addressed, please check. |
||
| /** | ||
| * Returns a list of active queries associated with this SQLContext | ||
| * | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.streaming | ||
|
|
||
| import scala.language.reflectiveCalls | ||
|
|
||
| import org.scalatest.BeforeAndAfter | ||
|
|
||
| import org.apache.spark.SparkConf | ||
| import org.apache.spark.sql.execution.streaming._ | ||
| import org.apache.spark.sql.streaming.StreamingQueryListener._ | ||
|
|
||
|
|
||
| class StreamingQueryListenersConfSuite extends StreamTest with BeforeAndAfter { | ||
|
|
||
| import testImplicits._ | ||
|
|
||
|
|
||
| override protected def sparkConf: SparkConf = | ||
| super.sparkConf.set("spark.sql.streamingQueryListeners", | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. seems a mistake here. |
||
| "org.apache.spark.sql.streaming.TestListener") | ||
|
|
||
| test("test if the configured query lister is loaded") { | ||
| testStream(MemoryStream[Int].toDS)( | ||
| StartStream(), | ||
| StopStream | ||
| ) | ||
|
|
||
| assert(TestListener.queryStartedEvent != null) | ||
| assert(TestListener.queryTerminatedEvent != null) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| object TestListener { | ||
| @volatile var queryStartedEvent: QueryStartedEvent = null | ||
| @volatile var queryTerminatedEvent: QueryTerminatedEvent = null | ||
| } | ||
|
|
||
| class TestListener(sparkConf: SparkConf) extends StreamingQueryListener { | ||
|
|
||
| override def onQueryStarted(event: QueryStartedEvent): Unit = { | ||
| TestListener.queryStartedEvent = event | ||
| } | ||
|
|
||
| override def onQueryProgress(event: QueryProgressEvent): Unit = {} | ||
|
|
||
| override def onQueryTerminated(event: QueryTerminatedEvent): Unit = { | ||
| TestListener.queryTerminatedEvent = event | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would do this at debug level ..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Either debug or info is fine for me, since it would add just couple of log lines only once.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since its only once and provides information to user I guess info is fine. Similar pattern here https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/SparkContext.scala#L2359