forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-9709] [SQL] Avoid starving unsafe operators that use sort
The issue is that a task may run multiple sorts, and the sorts run by the child operator (i.e. parent RDD) may acquire all available memory such that other sorts in the same task do not have enough to proceed. This manifests itself in an `IOException("Unable to acquire X bytes of memory")` thrown by `UnsafeExternalSorter`. The solution is to reserve a page in each sorter in the chain before computing the child operator's (parent RDD's) partitions. This requires us to use a new special RDD that does some preparation before computing the parent's partitions. Author: Andrew Or <[email protected]> Closes apache#8011 from andrewor14/unsafe-starve-memory and squashes the following commits: 35b69a4 [Andrew Or] Simplify test 0b07782 [Andrew Or] Minor: update comments 5d5afdf [Andrew Or] Merge branch 'master' of github.com:apache/spark into unsafe-starve-memory 254032e [Andrew Or] Add tests 234acbd [Andrew Or] Reserve a page in sorter when preparing each partition b889e08 [Andrew Or] MapPartitionsWithPreparationRDD (cherry picked from commit 014a9f9) Signed-off-by: Reynold Xin <[email protected]>
- Loading branch information
Showing
8 changed files
with
184 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
core/src/main/scala/org/apache/spark/rdd/MapPartitionsWithPreparationRDD.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* 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.rdd | ||
|
||
import scala.reflect.ClassTag | ||
|
||
import org.apache.spark.{Partition, Partitioner, TaskContext} | ||
|
||
/** | ||
* An RDD that applies a user provided function to every partition of the parent RDD, and | ||
* additionally allows the user to prepare each partition before computing the parent partition. | ||
*/ | ||
private[spark] class MapPartitionsWithPreparationRDD[U: ClassTag, T: ClassTag, M: ClassTag]( | ||
prev: RDD[T], | ||
preparePartition: () => M, | ||
executePartition: (TaskContext, Int, M, Iterator[T]) => Iterator[U], | ||
preservesPartitioning: Boolean = false) | ||
extends RDD[U](prev) { | ||
|
||
override val partitioner: Option[Partitioner] = { | ||
if (preservesPartitioning) firstParent[T].partitioner else None | ||
} | ||
|
||
override def getPartitions: Array[Partition] = firstParent[T].partitions | ||
|
||
/** | ||
* Prepare a partition before computing it from its parent. | ||
*/ | ||
override def compute(partition: Partition, context: TaskContext): Iterator[U] = { | ||
val preparedArgument = preparePartition() | ||
val parentIterator = firstParent[T].iterator(partition, context) | ||
executePartition(context, partition.index, preparedArgument, parentIterator) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
core/src/test/scala/org/apache/spark/rdd/MapPartitionsWithPreparationRDDSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* 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.rdd | ||
|
||
import scala.collection.mutable | ||
|
||
import org.apache.spark.{LocalSparkContext, SparkContext, SparkFunSuite, TaskContext} | ||
|
||
class MapPartitionsWithPreparationRDDSuite extends SparkFunSuite with LocalSparkContext { | ||
|
||
test("prepare called before parent partition is computed") { | ||
sc = new SparkContext("local", "test") | ||
|
||
// Have the parent partition push a number to the list | ||
val parent = sc.parallelize(1 to 100, 1).mapPartitions { iter => | ||
TestObject.things.append(20) | ||
iter | ||
} | ||
|
||
// Push a different number during the prepare phase | ||
val preparePartition = () => { TestObject.things.append(10) } | ||
|
||
// Push yet another number during the execution phase | ||
val executePartition = ( | ||
taskContext: TaskContext, | ||
partitionIndex: Int, | ||
notUsed: Unit, | ||
parentIterator: Iterator[Int]) => { | ||
TestObject.things.append(30) | ||
TestObject.things.iterator | ||
} | ||
|
||
// Verify that the numbers are pushed in the order expected | ||
val result = { | ||
new MapPartitionsWithPreparationRDD[Int, Int, Unit]( | ||
parent, preparePartition, executePartition).collect() | ||
} | ||
assert(result === Array(10, 20, 30)) | ||
} | ||
|
||
} | ||
|
||
private object TestObject { | ||
val things = new mutable.ListBuffer[Int] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters