From e82f94ede50a5aae986ff53a9c5a63d5de226f24 Mon Sep 17 00:00:00 2001 From: Benoy Antony Date: Tue, 9 Sep 2014 12:06:56 -0700 Subject: [PATCH] Use address with scheme, but Allpha version removes the scheme --- .../org/apache/spark/deploy/yarn/YarnRMClientImpl.scala | 3 ++- .../org/apache/spark/deploy/yarn/ApplicationMaster.scala | 6 +----- 2 files changed, 3 insertions(+), 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 index 14c6c5b0c4d1d..fc30953011812 100644 --- 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 index c5e393d6a0d5a..0337af05da1d6 100644 --- 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 {