review commit

witgo · witgo · commit 655a820312c2 · 2014-06-06T17:42:19.000+08:00
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala
@@ -94,7 +94,7 @@ private[yarn] class YarnAllocationHandler(
     sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>
       defaultMemoryOverhead = s.toInt
     }
-    sparkConf.getOption(s"spark.yarn.executor.memoryOverhead").foreach { s =>
+    sparkConf.getOption("spark.yarn.executor.memoryOverhead").foreach { s =>
       defaultMemoryOverhead = s.toInt
     }
     defaultMemoryOverhead
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
@@ -71,7 +71,7 @@ trait ClientBase extends Logging {
     sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>
       defaultMemoryOverhead = s.toInt
     }
-    sparkConf.getOption(s"spark.yarn.driver.memoryOverhead").foreach { s =>
+    sparkConf.getOption("spark.yarn.driver.memoryOverhead").foreach { s =>
       defaultMemoryOverhead = s.toInt
     }
     defaultMemoryOverhead
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
@@ -98,7 +98,7 @@ private[yarn] class YarnAllocationHandler(
     sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>
       defaultMemoryOverhead = s.toInt
     }
-    sparkConf.getOption(s"spark.yarn.executor.memoryOverhead").foreach { s =>
+    sparkConf.getOption("spark.yarn.executor.memoryOverhead").foreach { s =>
       defaultMemoryOverhead = s.toInt
     }
     defaultMemoryOverhead

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private[yarn] class YarnAllocationHandler(`
`94`	`94`	`sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>`
`95`	`95`	`defaultMemoryOverhead = s.toInt`
`96`	`96`	`}`
`97`		`- sparkConf.getOption(s"spark.yarn.executor.memoryOverhead").foreach { s =>`
	`97`	`+ sparkConf.getOption("spark.yarn.executor.memoryOverhead").foreach { s =>`
`98`	`98`	`defaultMemoryOverhead = s.toInt`
`99`	`99`	`}`
`100`	`100`	`defaultMemoryOverhead`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ trait ClientBase extends Logging {`
`71`	`71`	`sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>`
`72`	`72`	`defaultMemoryOverhead = s.toInt`
`73`	`73`	`}`
`74`		`- sparkConf.getOption(s"spark.yarn.driver.memoryOverhead").foreach { s =>`
	`74`	`+ sparkConf.getOption("spark.yarn.driver.memoryOverhead").foreach { s =>`
`75`	`75`	`defaultMemoryOverhead = s.toInt`
`76`	`76`	`}`
`77`	`77`	`defaultMemoryOverhead`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private[yarn] class YarnAllocationHandler(`
`98`	`98`	`sparkConf.getOption("spark.yarn.container.memoryOverhead").foreach { s =>`
`99`	`99`	`defaultMemoryOverhead = s.toInt`
`100`	`100`	`}`
`101`		`- sparkConf.getOption(s"spark.yarn.executor.memoryOverhead").foreach { s =>`
	`101`	`+ sparkConf.getOption("spark.yarn.executor.memoryOverhead").foreach { s =>`
`102`	`102`	`defaultMemoryOverhead = s.toInt`
`103`	`103`	`}`
`104`	`104`	`defaultMemoryOverhead`