aboutsummaryrefslogtreecommitdiff
path: root/yarn
diff options
context:
space:
mode:
authorSandy Ryza <sandy@cloudera.com>2014-01-21 00:38:02 -0800
committerSandy Ryza <sandy@cloudera.com>2014-01-21 00:38:02 -0800
commitadf42611f16daec091af10f2c9b39bd154dc67b3 (patch)
tree3c2d6396d3fe3dc50ff5176572b83c97154c1a41 /yarn
parent3e85b87d9033e6d9a2634f7598abc3acee77486f (diff)
downloadspark-adf42611f16daec091af10f2c9b39bd154dc67b3.tar.gz
spark-adf42611f16daec091af10f2c9b39bd154dc67b3.tar.bz2
spark-adf42611f16daec091af10f2c9b39bd154dc67b3.zip
Incorporate Tom's comments - update doc and code to reflect that core requests may not always be honored
Diffstat (limited to 'yarn')
-rw-r--r--yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala3
1 files changed, 1 insertions, 2 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 f53c13013f..1ac61124cb 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
@@ -102,8 +102,7 @@ private[yarn] class YarnAllocationHandler(
def getNumWorkersFailed: Int = numWorkersFailed.intValue
def isResourceConstraintSatisfied(container: Container): Boolean = {
- (container.getResource.getMemory >= (workerMemory + YarnAllocationHandler.MEMORY_OVERHEAD)
- && container.getResource.getVirtualCores >= workerCores)
+ container.getResource.getMemory >= (workerMemory + YarnAllocationHandler.MEMORY_OVERHEAD)
}
def releaseContainer(container: Container) {