Skip to content

[SPARK-9419] ShuffleMemoryManager and MemoryStore should track memory on a per-task, not per-thread, basis #7734

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
JoshRosen wants to merge 11 commits into from
Closed

[SPARK-9419] ShuffleMemoryManager and MemoryStore should track memory on a per-task, not per-thread, basis #7734

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c9e8e54
Use TaskAttemptIds to track unroll memory
JoshRosen Jul 28, 2015
2e1e0f8
Use TaskAttemptIds to track shuffle memory
JoshRosen Jul 28, 2015
1b0083b
Roll back fix in PySpark, which is no longer necessary
JoshRosen Jul 28, 2015
5e2f01e
Fix capitalization
JoshRosen Jul 28, 2015
fa78ee8
Move Executor's cleanup into Task so that TaskContext is defined when…
JoshRosen Jul 28, 2015
f57f3f2
More thread -> task changes
JoshRosen Jul 28, 2015
7b0f04b
Fix ShuffleMemoryManagerSuite
JoshRosen Jul 28, 2015
44f6497
Fix long line.
JoshRosen Jul 28, 2015
ed25d3b
Address minor PR review comments
JoshRosen Jul 29, 2015
57c9b4e
Merge remote-tracking branch 'origin/master' into memory-tracking-fixes
JoshRosen Jul 29, 2015
b4b1702
Propagate TaskContext to writer threads.
JoshRosen Jul 29, 2015
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
Fix long line.
  • Loading branch information
@JoshRosen
JoshRosen committed Jul 28, 2015
commit 44f6497cf4fa3be09feffb299969c96878e1872d
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/shuffle/ShuffleMemoryManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ private[spark] class ShuffleMemoryManager(maxMemory: Long) extends Logging {
taskMemory(taskAttemptId) += toGrant
return toGrant
} else {
logInfo(s"Thread $taskAttemptId waiting for at least 1/2N of shuffle memory pool to be free")
logInfo(
s"Thread $taskAttemptId waiting for at least 1/2N of shuffle memory pool to be free")
wait()
}
} else {
Expand Down