Use address with scheme, but Allpha version removes the scheme

apache · Sep 9, 2014 · e82f94e · e82f94e
1 parent 92127c9
commit e82f94e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnRMClientImpl.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/YarnRMClientImpl.scala
@@ -18,6 +18,7 @@
 package org.apache.spark.deploy.yarn
 
 import scala.collection.{Map, Set}
+import java.net.URI;
 
 import org.apache.hadoop.net.NetUtils
 import org.apache.hadoop.yarn.api._
@@ -98,7 +99,7 @@ private class YarnRMClientImpl(args: ApplicationMasterArguments) extends YarnRMC
     appMasterRequest.setHost(Utils.localHostName())
     appMasterRequest.setRpcPort(0)
     //remove the scheme from the url if it exists since Hadoop does not expect scheme
-    appMasterRequest.setTrackingUrl(uiAddress.replaceAll("^http(\\w)*://", ""))
+    appMasterRequest.setTrackingUrl(new URI(uiAddress).getAuthority())
     resourceManager.registerApplicationMaster(appMasterRequest)
   }
 

diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
@@ -189,11 +189,7 @@ private[spark] class ApplicationMaster(args: ApplicationMasterArguments,
     if (sc == null) {
       finish(FinalApplicationStatus.FAILED, "Timed out waiting for SparkContext.")
     } else {
-        var uiAddress = sc.ui.appUIHostPort
-        if (yarnConf.get("yarn.http.policy").equals("HTTPS_ONLY")) {
-          uiAddress = sc.ui.appUIAddress
-        }
-        registerAM(uiAddress, securityMgr)
+        registerAM(sc.ui.appUIAddress, securityMgr)
       try {
         userThread.join()
       } finally {