[SPARK-2140] Updating heap memory calculation for YARN stable and alpha.

Chris Cope · Chris Cope · commit 52b4e45f657b · 2014-09-04T14:04:47.000Z
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
@@ -104,11 +104,7 @@ class Client(clientArgs: ClientArguments, hadoopConf: Configuration, spConf: Spa
   }
 
   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
+    args.amMemory
   }
 
   def setupSecurityToken(amContainer: ContainerLaunchContext) = {
diff --git a/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/stable/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -104,11 +104,6 @@ class Client(clientArgs: ClientArguments, hadoopConf: Configuration, spConf: Spa
   }
 
   def calculateAMMemory(newApp: GetNewApplicationResponse) :Int = {
-    // TODO: Need a replacement for the following code to fix -Xmx?
-    // val minResMemory: Int = newApp.getMinimumResourceCapability().getMemory()
-    // var amMemory = ((args.amMemory / minResMemory) * minResMemory) +
-    //  ((if ((args.amMemory % minResMemory) == 0) 0 else minResMemory) -
-    //    memoryOverhead )
     args.amMemory
   }
 

Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,7 @@ class Client(clientArgs: ClientArguments, hadoopConf: Configuration, spConf: Spa`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`def calculateAMMemory(newApp: GetNewApplicationResponse): Int = {`
`107`		`- val minResMemory = newApp.getMinimumResourceCapability().getMemory()`
`108`		`- val amMemory = ((args.amMemory / minResMemory) * minResMemory) +`
`109`		`- ((if ((args.amMemory % minResMemory) == 0) 0 else minResMemory) -`
`110`		`- memoryOverhead)`
`111`		`- amMemory`
	`107`	`+ args.amMemory`
`112`	`108`	`}`
`113`	`109`
`114`	`110`	`def setupSecurityToken(amContainer: ContainerLaunchContext) = {`
Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,6 @@ class Client(clientArgs: ClientArguments, hadoopConf: Configuration, spConf: Spa`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`def calculateAMMemory(newApp: GetNewApplicationResponse) :Int = {`
`107`		`- // TODO: Need a replacement for the following code to fix -Xmx?`
`108`		`- // val minResMemory: Int = newApp.getMinimumResourceCapability().getMemory()`
`109`		`- // var amMemory = ((args.amMemory / minResMemory) * minResMemory) +`
`110`		`- // ((if ((args.amMemory % minResMemory) == 0) 0 else minResMemory) -`
`111`		`- // memoryOverhead )`
`112`	`107`	`args.amMemory`
`113`	`108`	`}`
`114`	`109`