review commit

witgo · witgo · commit e3c531d515ab · 2014-06-06T17:33:41.000+08:00
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
@@ -67,7 +67,7 @@ trait ClientBase extends Logging {
 
   // Additional memory overhead - in mb.
   protected def memoryOverhead: Int = {
-    var defaultMemoryOverhead = (args.amMemory * 0.25D).ceil.toInt
+    var defaultMemoryOverhead = YarnAllocationHandler.MEMORY_OVERHEAD
     sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>
       defaultMemoryOverhead = s.toInt
     }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ trait ClientBase extends Logging {`
`67`	`67`
`68`	`68`	`// Additional memory overhead - in mb.`
`69`	`69`	`protected def memoryOverhead: Int = {`
`70`		`- var defaultMemoryOverhead = (args.amMemory * 0.25D).ceil.toInt`
	`70`	`+ var defaultMemoryOverhead = YarnAllocationHandler.MEMORY_OVERHEAD`
`71`	`71`	`sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>`
`72`	`72`	`defaultMemoryOverhead = s.toInt`
`73`	`73`	`}`