-
Notifications
You must be signed in to change notification settings - Fork 28.5k
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
[SPARK-25081][Core]Nested spill in ShuffleExternalSorter should not access released memory page #22062
[SPARK-25081][Core]Nested spill in ShuffleExternalSorter should not access released memory page #22062
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 |
---|---|---|
@@ -0,0 +1,111 @@ | ||
/* | ||
* 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.shuffle.sort | ||
|
||
import java.lang.{Long => JLong} | ||
|
||
import org.mockito.Mockito.when | ||
import org.scalatest.mockito.MockitoSugar | ||
|
||
import org.apache.spark._ | ||
import org.apache.spark.executor.{ShuffleWriteMetrics, TaskMetrics} | ||
import org.apache.spark.memory._ | ||
import org.apache.spark.unsafe.Platform | ||
|
||
class ShuffleExternalSorterSuite extends SparkFunSuite with LocalSparkContext with MockitoSugar { | ||
|
||
test("nested spill should be no-op") { | ||
val conf = new SparkConf() | ||
.setMaster("local[1]") | ||
.setAppName("ShuffleExternalSorterSuite") | ||
.set("spark.testing", "true") | ||
.set("spark.testing.memory", "1600") | ||
.set("spark.memory.fraction", "1") | ||
sc = new SparkContext(conf) | ||
|
||
val memoryManager = UnifiedMemoryManager(conf, 1) | ||
|
||
var shouldAllocate = false | ||
|
||
// Mock `TaskMemoryManager` to allocate free memory when `shouldAllocate` is true. | ||
// This will trigger a nested spill and expose issues if we don't handle this case properly. | ||
val taskMemoryManager = new TaskMemoryManager(memoryManager, 0) { | ||
override def acquireExecutionMemory(required: Long, consumer: MemoryConsumer): Long = { | ||
// ExecutionMemoryPool.acquireMemory will wait until there are 400 bytes for a task to use. | ||
// So we leave 400 bytes for the task. | ||
if (shouldAllocate && | ||
memoryManager.maxHeapMemory - memoryManager.executionMemoryUsed > 400) { | ||
val acquireExecutionMemoryMethod = | ||
memoryManager.getClass.getMethods.filter(_.getName == "acquireExecutionMemory").head | ||
acquireExecutionMemoryMethod.invoke( | ||
memoryManager, | ||
JLong.valueOf( | ||
memoryManager.maxHeapMemory - memoryManager.executionMemoryUsed - 400), | ||
JLong.valueOf(1L), // taskAttemptId | ||
MemoryMode.ON_HEAP | ||
).asInstanceOf[java.lang.Long] | ||
} | ||
super.acquireExecutionMemory(required, consumer) | ||
} | ||
} | ||
val taskContext = mock[TaskContext] | ||
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. Do we need mockito here? We can also create a 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.
I can. Just to save several lines :) 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. lol |
||
val taskMetrics = new TaskMetrics | ||
when(taskContext.taskMetrics()).thenReturn(taskMetrics) | ||
val sorter = new ShuffleExternalSorter( | ||
taskMemoryManager, | ||
sc.env.blockManager, | ||
taskContext, | ||
100, // initialSize - This will require ShuffleInMemorySorter to acquire at least 800 bytes | ||
1, // numPartitions | ||
conf, | ||
new ShuffleWriteMetrics) | ||
val inMemSorter = { | ||
val field = sorter.getClass.getDeclaredField("inMemSorter") | ||
field.setAccessible(true) | ||
field.get(sorter).asInstanceOf[ShuffleInMemorySorter] | ||
} | ||
// Allocate memory to make the next "insertRecord" call triggers a spill. | ||
val bytes = new Array[Byte](1) | ||
while (inMemSorter.hasSpaceForAnotherRecord) { | ||
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. Access to the 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.
Yes. |
||
sorter.insertRecord(bytes, Platform.BYTE_ARRAY_OFFSET, 1, 0) | ||
} | ||
|
||
// This flag will make the mocked TaskMemoryManager acquire free memory released by spill to | ||
// trigger a nested spill. | ||
shouldAllocate = true | ||
|
||
// Should throw `SparkOutOfMemoryError` as there is no enough memory: `ShuffleInMemorySorter` | ||
// will try to acquire 800 bytes but there are only 400 bytes available. | ||
// | ||
// Before the fix, a nested spill may use a released page and this causes two tasks access the | ||
// same memory page. When a task reads memory written by another task, many types of failures | ||
// may happen. Here are some examples we have seen: | ||
// | ||
// - JVM crash. (This is easy to reproduce in the unit test as we fill newly allocated and | ||
// deallocated memory with 0xa5 and 0x5a bytes which usually points to an invalid memory | ||
// address) | ||
// - java.lang.IllegalArgumentException: Comparison method violates its general contract! | ||
// - java.lang.NullPointerException | ||
// at org.apache.spark.memory.TaskMemoryManager.getPage(TaskMemoryManager.java:384) | ||
// - java.lang.UnsupportedOperationException: Cannot grow BufferHolder by size -536870912 | ||
// because the size after growing exceeds size limitation 2147483632 | ||
intercept[SparkOutOfMemoryError] { | ||
sorter.insertRecord(bytes, Platform.BYTE_ARRAY_OFFSET, 1, 0) | ||
} | ||
} | ||
} |
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.
For my understanding: this is enough to fix the actual issue here right?
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 also need to set
usableCapacity
to0
. Otherwise,spark/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleExternalSorter.java
Line 343 in 9b8521e
array
.Setting
array
tonull
is just for safety so that anything incorrect use will fail with NPE.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.
The process of
inMemSorter.reset()
may throw oom inconsumer.allocateArray()
, at this time array=null.ShuffleExternalSorter#cleanupResources
calledinMemSorter.getMemoryUsage()
, throwing npe.UnsafeExternalSorter#inMemSorter
also has this problem.Do I need to submit a pr to solve this problem? @zsxwing @hvanhovell
executor log