diff options
| author | Thomas Graves <tgraves@apache.org> | 2014-09-12 20:31:11 -0500 |
|---|---|---|
| committer | Thomas Graves <tgraves@apache.org> | 2014-09-12 20:31:11 -0500 |
| commit | 25311c2c545a60eb9dcf704814d4600987852155 (patch) | |
| tree | e9ceb19e1a3281a4771c68c5861cb4e6b7ee7fc5 /yarn/stable | |
| parent | af2583826c15d2a4e2732017ea20feeff0fb79f6 (diff) | |
| download | spark-25311c2c545a60eb9dcf704814d4600987852155.tar.gz spark-25311c2c545a60eb9dcf704814d4600987852155.tar.bz2 spark-25311c2c545a60eb9dcf704814d4600987852155.zip | |
[SPARK-3456] YarnAllocator on alpha can lose container requests to RM
Author: Thomas Graves <tgraves@apache.org>
Closes #2373 from tgravescs/SPARK-3456 and squashes the following commits:
77e9532 [Thomas Graves] [SPARK-3456] YarnAllocator on alpha can lose container requests to RM
Diffstat (limited to 'yarn/stable')
| -rw-r--r-- | yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala index 5438f151ac..e44a8db41b 100644 --- a/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala +++ b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala @@ -47,7 +47,8 @@ private[yarn] class YarnAllocationHandler( amClient.releaseAssignedContainer(container.getId()) } - override protected def allocateContainers(count: Int): YarnAllocateResponse = { + // pending isn't used on stable as the AMRMClient handles incremental asks + override protected def allocateContainers(count: Int, pending: Int): YarnAllocateResponse = { addResourceRequests(count) // We have already set the container request. Poll the ResourceManager for a response. |