Remove usages of getAMMemory

This merges the refator with commit ed1980f.
apache · Sep 16, 2014 · 45ccdea · 45ccdea
1 parent d8e33b6
commit 45ccdea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 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
@@ -88,7 +88,7 @@ private[spark] class Client(
       : ContainerLaunchContext = {
     val containerContext = super.createContainerLaunchContext(newAppResponse)
     val capability = Records.newRecord(classOf[Resource])
-    capability.setMemory(getAMMemory(newAppResponse) + amMemoryOverhead)
+    capability.setMemory(args.amMemory + amMemoryOverhead)
     containerContext.setResource(capability)
     containerContext
   }
@@ -116,17 +116,6 @@ private[spark] class Client(
     amContainer.setContainerTokens(ByteBuffer.wrap(dob.getData()))
   }
 
-  /**
-   * Return the amount of memory for launching the ApplicationMaster container (MB).
-   * GetNewApplicationResponse#getMinimumResourceCapability does not exist in the stable API.
-   */
-  override def getAMMemory(newAppResponse: GetNewApplicationResponse): Int = {
-    val minResMemory = newAppResponse.getMinimumResourceCapability().getMemory()
-    val amMemory = ((args.amMemory / minResMemory) * minResMemory) +
-      ((if ((args.amMemory % minResMemory) == 0) 0 else minResMemory) - amMemoryOverhead)
-    amMemory
-  }
-
   /**
    * Return the security token used by this client to communicate with the ApplicationMaster.
    * If no security is enabled, the token returned by the report is null.

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
@@ -66,7 +66,7 @@ private[spark] trait ClientBase extends Logging {
       throw new IllegalArgumentException(s"Required executor memory ($executorMem MB) " +
         s"is above the max threshold ($maxMem MB) of this cluster!")
     }
-    val amMem = getAMMemory(newAppResponse) + amMemoryOverhead
+    val amMem = args.amMemory + amMemoryOverhead
     if (amMem > maxMem) {
       throw new IllegalArgumentException(s"Required AM memory ($amMem MB) " +
         s"is above the max threshold ($maxMem MB) of this cluster!")
@@ -306,7 +306,7 @@ private[spark] trait ClientBase extends Logging {
     val javaOpts = ListBuffer[String]()
 
     // Add Xmx for AM memory
-    javaOpts += "-Xmx" + getAMMemory(newAppResponse) + "m"
+    javaOpts += "-Xmx" + args.amMemory + "m"
 
     val tmpDir = new Path(Environment.PWD.$(), YarnConfiguration.DEFAULT_CONTAINER_TEMP_DIR)
     javaOpts += "-Djava.io.tmpdir=" + tmpDir
@@ -476,9 +476,6 @@ private[spark] trait ClientBase extends Logging {
    * If no security is enabled, the token returned by the report is null.
    */
   protected def getClientToken(report: ApplicationReport): String
-
-  /** Return the amount of memory for launching the ApplicationMaster container (MB). */
-  protected def getAMMemory(newAppResponse: GetNewApplicationResponse): Int = args.amMemory
 }
 
 private[spark] object ClientBase extends Logging {

diff --git a/yarn/common/src/test/scala/org/apache/spark/deploy/yarn/ClientBaseSuite.scala b/yarn/common/src/test/scala/org/apache/spark/deploy/yarn/ClientBaseSuite.scala
@@ -237,7 +237,6 @@ class ClientBaseSuite extends FunSuite with Matchers {
       val hadoopConf: Configuration,
       val sparkConf: SparkConf,
       val yarnConf: YarnConfiguration) extends ClientBase {
-    override def getAMMemory(newApp: GetNewApplicationResponse): Int = ???
     override def setupSecurityToken(amContainer: ContainerLaunchContext): Unit = ???
     override def submitApplication(): ApplicationId = ???
     override def getApplicationReport(appId: ApplicationId): ApplicationReport = ???