You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/07/31 06:38:03 UTC
git commit: Required AM memory is "amMem", not "args.amMemory"
Repository: spark
Updated Branches:
refs/heads/master 894d48ffb -> 118c1c422
Required AM memory is "amMem", not "args.amMemory"
"ERROR yarn.Client: Required AM memory (1024) is above the max threshold (1048) of this cluster" appears if this code is not changed. obviously, 1024 is less than 1048, so change this
Author: derek ma <ma...@asiainfo-linkage.com>
Closes #1494 from maji2014/master and squashes the following commits:
b0f6640 [derek ma] Required AM memory is "amMem", not "args.amMemory"
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/118c1c42
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/118c1c42
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/118c1c42
Branch: refs/heads/master
Commit: 118c1c422d3dfbfb2277995062678f0a808af6c3
Parents: 894d48f
Author: derek ma <ma...@asiainfo-linkage.com>
Authored: Wed Jul 30 21:37:59 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Jul 30 21:37:59 2014 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/118c1c42/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
----------------------------------------------------------------------
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
index a1298e8..b7e8636 100644
--- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
+++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -109,7 +109,7 @@ trait ClientBase extends Logging {
if (amMem > maxMem) {
val errorMessage = "Required AM memory (%d) is above the max threshold (%d) of this cluster."
- .format(args.amMemory, maxMem)
+ .format(amMem, maxMem)
logError(errorMessage)
throw new IllegalArgumentException(errorMessage)
}