-
Notifications
You must be signed in to change notification settings - Fork 29.1k
[SPARK-28574][CORE] Allow to config different sizes for event queues #25307
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 all commits
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 |
|---|---|---|
|
|
@@ -46,8 +46,18 @@ private class AsyncEventQueue( | |
|
|
||
| // Cap the capacity of the queue so we get an explicit error (rather than an OOM exception) if | ||
| // it's perpetually being added to more quickly than it's being drained. | ||
| private val eventQueue = new LinkedBlockingQueue[SparkListenerEvent]( | ||
| conf.get(LISTENER_BUS_EVENT_QUEUE_CAPACITY)) | ||
| // The capacity can be configured by spark.scheduler.listenerbus.eventqueue.${name}.capacity, | ||
| // if no such conf is specified, use the value specified in | ||
| // LISTENER_BUS_EVENT_QUEUE_CAPACITY | ||
| private[scheduler] def capacity: Int = { | ||
| val queuesize = conf.getInt(s"spark.scheduler.listenerbus.eventqueue.${name}.capacity", | ||
|
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. Instead of hard-coded here, can we define it in core/src/main/scala/org/apache/spark/internal/config/package.scala ? |
||
| conf.get(LISTENER_BUS_EVENT_QUEUE_CAPACITY)) | ||
|
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. Nit: indent. |
||
| assert(queuesize > 0, s"capacity for event queue $name must be greater than 0, " + | ||
| s"but $queuesize is configured.") | ||
| queuesize | ||
| } | ||
|
|
||
| private val eventQueue = new LinkedBlockingQueue[SparkListenerEvent](capacity) | ||
|
|
||
| // Keep the event count separately, so that waitUntilEmpty() can be implemented properly; | ||
| // this allows that method to return only when the events in the queue have been fully | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -532,6 +532,34 @@ class SparkListenerSuite extends SparkFunSuite with LocalSparkContext with Match | |
| } | ||
| } | ||
|
|
||
| test("event queue size can be configued through spark conf") { | ||
| // configure the shared queue size to be 1, event log queue size to be 2, | ||
| // and listner bus event queue size to be 5 | ||
| val conf = new SparkConf(false) | ||
| .set(LISTENER_BUS_EVENT_QUEUE_CAPACITY, 5) | ||
| .set(s"spark.scheduler.listenerbus.eventqueue.${SHARED_QUEUE}.capacity", "1") | ||
| .set(s"spark.scheduler.listenerbus.eventqueue.${EVENT_LOG_QUEUE}.capacity", "2") | ||
|
|
||
| val bus = new LiveListenerBus(conf) | ||
|
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. nit:
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. The bus is actually never started, so no need to stop. |
||
| val counter1 = new BasicJobCounter() | ||
| val counter2 = new BasicJobCounter() | ||
| val counter3 = new BasicJobCounter() | ||
|
|
||
| // add a new shared, status and event queue | ||
| bus.addToSharedQueue(counter1) | ||
|
Contributor
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. Maybe add comment to explain this is just to trigger add a new Queue.
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. added comments |
||
| bus.addToStatusQueue(counter2) | ||
| bus.addToEventLogQueue(counter3) | ||
|
|
||
| assert(bus.activeQueues() === Set(SHARED_QUEUE, APP_STATUS_QUEUE, EVENT_LOG_QUEUE)) | ||
| // check the size of shared queue is 1 as configured | ||
| assert(bus.getQueueCapacity(SHARED_QUEUE) == Some(1)) | ||
| // no specific size of status queue is configured, | ||
| // it shoud use the LISTENER_BUS_EVENT_QUEUE_CAPACITY | ||
| assert(bus.getQueueCapacity(APP_STATUS_QUEUE) == Some(5)) | ||
| // check the size of event log queue is 5 as configured | ||
| assert(bus.getQueueCapacity(EVENT_LOG_QUEUE) == Some(2)) | ||
| } | ||
|
|
||
| /** | ||
| * Assert that the given list of numbers has an average that is greater than zero. | ||
| */ | ||
|
|
||
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.
We need to update the conf description of LISTENER_BUS_EVENT_QUEUE_CAPACITY.