diff options
| author | Chris Cope <ccope@resilientscience.com> | 2014-09-11 08:13:07 -0500 |
|---|---|---|
| committer | Thomas Graves <tgraves@apache.org> | 2014-09-11 08:13:07 -0500 |
| commit | ed1980ffa9ccb87d76694ba910ef22df034bca49 (patch) | |
| tree | a88c965643148ccd1690db97aded1c24d7184bba /yarn/alpha | |
| parent | c27718f376483dbe6290de612094c8d4ce9b16b4 (diff) | |
| download | spark-ed1980ffa9ccb87d76694ba910ef22df034bca49.tar.gz spark-ed1980ffa9ccb87d76694ba910ef22df034bca49.tar.bz2 spark-ed1980ffa9ccb87d76694ba910ef22df034bca49.zip | |
[SPARK-2140] Updating heap memory calculation for YARN stable and alpha.
Updated pull request, reflecting YARN stable and alpha states. I am getting intermittent test failures on my own test infrastructure. Is that tracked anywhere yet?
Author: Chris Cope <ccope@resilientscience.com>
Closes #2253 from copester/master and squashes the following commits:
5ad89da [Chris Cope] [SPARK-2140] Removing calculateAMMemory functions since they are no longer needed.
52b4e45 [Chris Cope] [SPARK-2140] Updating heap memory calculation for YARN stable and alpha.
Diffstat (limited to 'yarn/alpha')
| -rw-r--r-- | yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala index 10fc39bba8..aff9ab71f0 100644 --- a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala +++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala @@ -103,14 +103,6 @@ class Client(clientArgs: ClientArguments, hadoopConf: Configuration, spConf: Spa appContext } - def calculateAMMemory(newApp: GetNewApplicationResponse): Int = { - val minResMemory = newApp.getMinimumResourceCapability().getMemory() - val amMemory = ((args.amMemory / minResMemory) * minResMemory) + - ((if ((args.amMemory % minResMemory) == 0) 0 else minResMemory) - - memoryOverhead) - amMemory - } - def setupSecurityToken(amContainer: ContainerLaunchContext) = { // Setup security tokens. val dob = new DataOutputBuffer() |