Skip to content

[SPARK-8611] [WebUI] Fix wrong REST UI Protocol on standalone cluster Web UI Page #7006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thegiive wants to merge 2 commits into from
Closed

[SPARK-8611] [WebUI] Fix wrong REST UI Protocol on standalone cluster Web UI Page #7006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
258dabf
Fix wrong REST API portcol on master web ui page
Jun 25, 2015
1ccbc30
[SPARK-8656] Fix the webUI and JSON API number is not synced
Jun 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/deploy/DeployMessage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private[deploy] object DeployMessages {
assert (port > 0)

def uri: String = "spark://" + host + ":" + port
def restUri: Option[String] = restPort.map { p => "spark://" + host + ":" + p }
def restUri: Option[String] = restPort.map { p => "http://" + host + ":" + p }
}

// WorkerWebUI to Worker
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ private[deploy] object JsonProtocol {

def writeMasterState(obj: MasterStateResponse): JObject = {
("url" -> obj.uri) ~
("workers" -> obj.workers.toList.map(writeWorkerInfo)) ~
("cores" -> obj.workers.map(_.cores).sum) ~
("coresused" -> obj.workers.map(_.coresUsed).sum) ~
("memory" -> obj.workers.map(_.memory).sum) ~
("memoryused" -> obj.workers.map(_.memoryUsed).sum) ~
("workers" -> obj.workers.filter(_.isAlive()).toList.map(writeWorkerInfo)) ~
("cores" -> obj.workers.filter(_.isAlive()).map(_.cores).sum) ~
("coresused" -> obj.workers.filter(_.isAlive()).map(_.coresUsed).sum) ~
("memory" -> obj.workers.filter(_.isAlive()).map(_.memory).sum) ~
("memoryused" -> obj.workers.filter(_.isAlive()).map(_.memoryUsed).sum) ~
("activeapps" -> obj.activeApps.toList.map(writeApplicationInfo)) ~
("completedapps" -> obj.completedApps.toList.map(writeApplicationInfo)) ~
("activedrivers" -> obj.activeDrivers.toList.map(writeDriverInfo)) ~
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/master/WorkerInfo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,8 @@ private[spark] class WorkerInfo(
def setState(state: WorkerState.Value): Unit = {
this.state = state
}

def isAlive(): Boolean={
Copy link
Contributor

@andrewor14 andrewor14 Jun 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add spaces before and after the =

this.state == WorkerState.ALIVE
}
}