Skip to content

[HOTFIX] History Server API docs error fix. #6628

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
wants to merge 2 commits into from
Closed

[HOTFIX] History Server API docs error fix. #6628

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
ca399b6
[HOTFIX] History Server API docs error fix.
harishreedharan Jun 3, 2015
a12553d
Javadoc updates.
harishreedharan Jun 3, 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
10 changes: 7 additions & 3 deletions core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ private[v1] class ApiRootResource extends UIRootFromServletContext {

@Path("applications/{appId}/logs")
def getEventLogs(
@PathParam("appId") appId: String): EventLogDownloadResource = {
@PathParam("appId") appId: String): EventLogDownloadResource = {
new EventLogDownloadResource(uiRoot, appId, None)
}

@Path("applications/{appId}/{attemptId}/logs")
def getEventLogs(
@PathParam("appId") appId: String,
@PathParam("attemptId") attemptId: String): EventLogDownloadResource = {
@PathParam("appId") appId: String,
@PathParam("attemptId") attemptId: String): EventLogDownloadResource = {
new EventLogDownloadResource(uiRoot, appId, Some(attemptId))
}
}
Expand Down Expand Up @@ -206,6 +206,10 @@ private[spark] trait UIRoot {
def getSparkUI(appKey: String): Option[SparkUI]
def getApplicationInfoList: Iterator[ApplicationInfo]

/**
* Write the event logs for the given app to the [[ZipOutputStream]] instance. If attemptId is
* [[None]], event logs for all attempts of this application will be written out.
*/
def writeEventLogs(appId: String, attemptId: Option[String], zipStream: ZipOutputStream): Unit = {
Response.serverError()
.entity("Event logs are only available through the history server.")
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/status/api/v1/EventLogDownloadResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private[v1] class EventLogDownloadResource(
}

val stream = new StreamingOutput {
override def write(output: OutputStream) = {
override def write(output: OutputStream): Unit = {
val zipStream = new ZipOutputStream(output)
try {
uIRoot.writeEventLogs(appId, attemptId, zipStream)
Expand Down
2 changes: 1 addition & 1 deletion docs/monitoring.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ for a running application, at `http://localhost:4040/api/v1`.
<td>Download the event logs for all attempts of the given application as a zip file</td>
</tr>
<tr>
<td><code>/applications/[app-id]/[attempt-id/logs</code></td>
<td><code>/applications/[app-id]/[attempt-id]/logs</code></td>
<td>Download the event logs for the specified attempt of the given application as a zip file</td>
</tr>
</table>
Expand Down