Repository: incubator-gearpump Updated Branches: refs/heads/master 0ac68b87f -> 73de3ce22
[GEARPUMP-354] Fix the tracking url resolution of a proxied Applicati⦠â¦on Master Be sure to do all of the following to help us incorporate your contribution quickly and easily: - [ ] Make sure the commit message is formatted like: `[GEARPUMP-<Jira issue #>] Meaningful description of pull request` - [ ] Make sure tests pass via `sbt clean test`. - [ ] Make sure old documentation affected by the pull request has been updated and new documentation added for new functionality. Author: Timea Magyar <[email protected]> Closes #230 from titikakatoo/resolve_app_master. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/73de3ce2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/73de3ce2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/73de3ce2 Branch: refs/heads/master Commit: 73de3ce22b3338d36f181b55fcc04df17b8b27cd Parents: 0ac68b8 Author: Timea Magyar <[email protected]> Authored: Fri Oct 20 16:18:56 2017 +0800 Committer: huafengw <[email protected]> Committed: Fri Oct 20 16:18:56 2017 +0800 ---------------------------------------------------------------------- .../gearpump/experiments/yarn/appmaster/YarnAppMaster.scala | 4 ++-- .../gearpump/experiments/yarn/client/AppMasterResolver.scala | 4 ++-- .../org/apache/gearpump/experiments/yarn/glue/Records.scala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/73de3ce2/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/YarnAppMaster.scala ---------------------------------------------------------------------- diff --git a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/YarnAppMaster.scala b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/YarnAppMaster.scala index 97577fb..1907a95 100644 --- a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/YarnAppMaster.scala +++ b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/appmaster/YarnAppMaster.scala @@ -365,7 +365,7 @@ object YarnAppMaster extends AkkaApp with ArgumentsParser { def getAppMaster(report: ApplicationReport, system: ActorSystem): ActorRef = { val client = new HttpClient() - val appMasterPath = s"${report.getOriginalTrackingUrl}/supervisor-actor-path" + val appMasterPath = s"${report.getTrackingURL}/supervisor-actor-path" val get = new GetMethod(appMasterPath) var status = client.executeMethod(get) @@ -379,7 +379,7 @@ object YarnAppMaster extends AkkaApp with ArgumentsParser { AkkaHelper.actorFor(system, get.getResponseBodyAsString) } else { throw new IOException("Fail to resolve AppMaster address, please make sure " + - s"${report.getOriginalTrackingUrl} is accessible...") + s"${report.getTrackingURL} is accessible...") } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/73de3ce2/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/client/AppMasterResolver.scala ---------------------------------------------------------------------- diff --git a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/client/AppMasterResolver.scala b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/client/AppMasterResolver.scala index 9fb69b2..90653e1 100644 --- a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/client/AppMasterResolver.scala +++ b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/client/AppMasterResolver.scala @@ -44,7 +44,7 @@ class AppMasterResolver(yarnClient: YarnClient, system: ActorSystem) { private def connect(appId: ApplicationId): ActorRef = { val report = yarnClient.getApplicationReport(appId) val client = new HttpClient() - val appMasterPath = s"${report.getOriginalTrackingUrl}/supervisor-actor-path" + val appMasterPath = s"${report.getTrackingURL}/supervisor-actor-path" LOG.info(s"appMasterPath=$appMasterPath") val get = new GetMethod(appMasterPath) val status = client.executeMethod(get) @@ -54,7 +54,7 @@ class AppMasterResolver(yarnClient: YarnClient, system: ActorSystem) { AkkaHelper.actorFor(system, response) } else { throw new IOException("Fail to resolve AppMaster address, please make sure " + - s"${report.getOriginalTrackingUrl} is accessible...") + s"${report.getTrackingURL} is accessible...") } } http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/73de3ce2/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/Records.scala ---------------------------------------------------------------------- diff --git a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/Records.scala b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/Records.scala index ca729ce..738e5ef 100644 --- a/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/Records.scala +++ b/experiments/yarn/src/main/scala/org/apache/gearpump/experiments/yarn/glue/Records.scala @@ -61,7 +61,7 @@ object Records { def getFinishTime: Long = impl.getFinishTime - def getOriginalTrackingUrl: String = impl.getOriginalTrackingUrl + def getTrackingURL: String = impl.getTrackingUrl def getYarnApplicationState: YarnApplicationState = impl.getYarnApplicationState
