Skip to content

Commit 9a25484

Browse files
Ling YuanGitHub Enterprise
authored andcommitted
upgrade spark call home service (apache#1029)
1 parent 5362b75 commit 9a25484

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

core/src/main/scala/org/apache/spark/SparkContext.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,9 +632,8 @@ class SparkContext(config: SparkConf) extends Logging {
632632
}
633633
_executorAllocationManager.foreach(_.start())
634634

635-
if (conf.get(SPARK_CALL_HOME_ENABLED)) {
636-
setupSparkCallHomeListener()
637-
}
635+
636+
setupSparkCallHomeListener()
638637
setupAndStartListenerBus()
639638
postEnvironmentUpdate()
640639
postApplicationStart()
@@ -2521,7 +2520,7 @@ class SparkContext(config: SparkConf) extends Logging {
25212520
val listeners = Utils.loadExtensions(classOf[SparkListenerInterface],
25222521
Seq(SPARK_CALL_HOME_LISTENER_CLASS), conf)
25232522
listeners.foreach { listener =>
2524-
listenerBus.addToSharedQueue(listener)
2523+
listenerBus.addToQueue(listener, SPARK_CALL_HOME_QUEUE_NAME)
25252524
logInfo(s"Registered Spark Call Home listener ${listener.getClass().getName()}")
25262525
}
25272526
} catch {

core/src/main/scala/org/apache/spark/internal/config/package.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ package object config {
3838
private[spark] val SPARK_TASK_PREFIX = "spark.task"
3939
private[spark] val LISTENER_BUS_EVENT_QUEUE_PREFIX = "spark.scheduler.listenerbus.eventqueue"
4040
private[spark] val SPARK_CALL_HOME_LISTENER_CLASS =
41-
"com.apple.aci.data.spark.callhome.listener.v1.SparkCallHomeListenerV1"
41+
"com.apple.spark.callhome.listener.SparkCallHomeListenerV2"
42+
private[spark] val SPARK_CALL_HOME_QUEUE_NAME =
43+
"SparkCallHome"
4244

4345
private[spark] val RESOURCES_DISCOVERY_PLUGIN =
4446
ConfigBuilder("spark.resources.discoveryPlugin")

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
<jpam.version>1.1</jpam.version>
194194
<selenium.version>3.141.59</selenium.version>
195195
<htmlunit.version>2.40.0</htmlunit.version>
196-
<acispark.callhome.version>0.2.0</acispark.callhome.version>
196+
<acispark.callhome.version>0.2.8</acispark.callhome.version>
197197
<iceberg.version>0.12.0-apple-preview-7</iceberg.version>
198198
<!--
199199
Managed up from older version from Avro; sync with jackson-module-paranamer dependency version

0 commit comments

Comments
 (0)