Skip to content

Commit 094e4f5

Browse files
committed
Revert "upgrade spark call home 0.2.8 (apache#1024)"
This reverts commit 8c6a5f1.
1 parent 80d872d commit 094e4f5

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2538,12 +2538,13 @@ class SparkContext(config: SparkConf) extends Logging {
25382538
*/
25392539
private def setupAndStartListenerBus(): Unit = {
25402540
try {
2541-
val listeners = Utils.loadExtensions(classOf[SparkListenerInterface],
2542-
Seq(SPARK_CALL_HOME_LISTENER_CLASS), conf)
2543-
listeners.foreach { listener =>
2544-
listenerBus.addToQueue(listener, SPARK_CALL_HOME_QUEUE_NAME)
2541+
conf.get(EXTRA_LISTENERS).foreach { classNames =>
2542+
val listeners = Utils.loadExtensions(classOf[SparkListenerInterface], classNames, conf)
2543+
listeners.foreach { listener =>
2544+
listenerBus.addToSharedQueue(listener)
25452545
logInfo(s"Registered listener ${listener.getClass().getName()}")
25462546
}
2547+
}
25472548
} catch {
25482549
case e: Exception =>
25492550
try {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ 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.spark.callhome.listener.SparkCallHomeListenerV2"
42-
private[spark] val SPARK_CALL_HOME_QUEUE_NAME =
43-
"SparkCallHome"
41+
"com.apple.aci.data.spark.callhome.listener.v1.SparkCallHomeListenerV1"
4442

4543
private[spark] val RESOURCES_DISCOVERY_PLUGIN =
4644
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.8</acispark.callhome.version>
196+
<acispark.callhome.version>0.2.0</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)