Skip to content

[SPARK-26265][Core] Fix deadlock in BytesToBytesMap.MapIterator when locking both BytesToBytesMap.MapIterator and TaskMemoryManager #23272

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.

Sign up for GitHub

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

Closed
viirya wants to merge 5 commits into from
Closed

[SPARK-26265][Core] Fix deadlock in BytesToBytesMap.MapIterator when locking both BytesToBytesMap.MapIterator and TaskMemoryManager #23272

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25e8e06
Fix deadlock in BytesToBytesMap.
viirya Dec 10, 2018
4c621d2
Covers OffHeap.
viirya Dec 10, 2018
9d52320
Remove VisibleForTesting.
viirya Dec 10, 2018
0405527
Shorten runnable.
viirya Dec 11, 2018
0849083
Move synchronized.
viirya Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Covers OffHeap.
  • Loading branch information
@viirya
viirya committed Dec 10, 2018
commit 4c621d2bd36c50a10591d93ccd77bd7c0432a873
4 changes: 3 additions & 1 deletion core/src/test/java/org/apache/spark/unsafe/map/AbstractBytesToBytesMapSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import org.apache.spark.SparkConf;
import org.apache.spark.executor.ShuffleWriteMetrics;
import org.apache.spark.memory.MemoryMode;
import org.apache.spark.memory.TestMemoryConsumer;
import org.apache.spark.memory.TaskMemoryManager;
import org.apache.spark.memory.TestMemoryManager;
Expand Down Expand Up @@ -671,7 +672,8 @@ public void testPeakMemoryUsed() {
@Test
public void avoidDeadlock() throws InterruptedException {
Copy link
Member

@dongjoon-hyun dongjoon-hyun Dec 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, @viirya . Since this test case reproduces Deadlock situation, we need a timeout logic. Otherwise, it will hang (instead of failures) when we hit this issue later.

Copy link
Member Author

@viirya viirya Dec 10, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tried several ways to set a timeout logic, but don't work. The deadlock always hangs the test and timeout logic.

memoryManager.limit(PAGE_SIZE_BYTES);
TestMemoryConsumer c1 = new TestMemoryConsumer(taskMemoryManager);
MemoryMode mode = useOffHeapMemoryAllocator() ? MemoryMode.OFF_HEAP: MemoryMode.ON_HEAP;
TestMemoryConsumer c1 = new TestMemoryConsumer(taskMemoryManager, mode);
BytesToBytesMap map =
new BytesToBytesMap(taskMemoryManager, blockManager, serializerManager, 1, 0.5, 1024);

Expand Down