Skip to content

Conversation

@ajbozarth
Copy link
Member

What changes were proposed in this pull request?

I've added a method to ApplicationHistoryProvider that returns the html paragraph to display when there are no applications. This allows providers other than FsHistoryProvider to determine what is printed. The current hard coded text is now moved into FsHistoryProvider since it assumed that's what was being used before.

I chose to make the function return html rather than text because the current text block had inline html in it and it allows a new implementation of ApplicationHistoryProvider more versatility. I did not see any security issues with this since injecting html here requires implementing ApplicationHistoryProvider and can't be done outside of code.

How was this patch tested?

Manual testing and dev/run-tests

No visible changes to the UI

@SparkQA
Copy link

SparkQA commented Oct 14, 2016

Test build #66976 has finished for PR 15490 at commit a343a08.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@ajbozarth
Copy link
Member Author

Jenkins, retest this please

@SparkQA
Copy link

SparkQA commented Oct 15, 2016

Test build #66985 has finished for PR 15490 at commit a343a08.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@ajbozarth
Copy link
Member Author

@steveloughran Since you opened the JIRA do you mind taking a look?

@steveloughran
Copy link
Contributor

@ajbozarth I'm not a spark committer, I'm not capaclbe of getting stuff in. I did dd one comment to some of the code, otherwise nothing I have issues with. LGTM

@ajbozarth
Copy link
Member Author

Thanks @steveloughran, I'm not seeing your code comment though. Also @srowen mind taking a look?

override def getEmptyListingHtml(): Seq[Node] = {
<p>
Did you specify the correct logging directory? Please verify your setting of
<span style="font-style:italic">spark.history.fs.logDirectory</span>
Copy link
Contributor

Choose a reason for hiding this comment

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

you couldn't actually include the current value here?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's a great idea, I'll update it

@steveloughran
Copy link
Contributor

Oh, I see, new UI had meant I'd left the comment partially incomplete. Sorry. Just the one: printing out the actual log dir location. That makes it much easier to identify a configuration problem and allow anyone with access to the cluster FS just to take a quick ls of the directory to see what's up

@ajbozarth
Copy link
Member Author

The dir is actually already displayed so I just added a few words to clarify that the current setting is displayed above.

screen shot 2016-10-18 at 3 48 39 pm

@SparkQA
Copy link

SparkQA commented Oct 19, 2016

Test build #67148 has finished for PR 15490 at commit 62e0f65.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@vanzin
Copy link
Contributor

vanzin commented Oct 19, 2016

LGTM. Merging to master.

@asfgit asfgit closed this in 444c2d2 Oct 19, 2016
@ajbozarth ajbozarth deleted the spark10541 branch October 19, 2016 20:05
robert3005 pushed a commit to palantir/spark that referenced this pull request Nov 1, 2016
…eir own text when there aren't any complete apps

## What changes were proposed in this pull request?

I've added a method to `ApplicationHistoryProvider` that returns the html paragraph to display when there are no applications. This allows providers other than `FsHistoryProvider` to determine what is printed. The current hard coded text is now moved into `FsHistoryProvider` since it assumed that's what was being used before.

I chose to make the function return html rather than text because the current text block had inline html in it and it allows a new implementation of `ApplicationHistoryProvider` more versatility. I did not see any security issues with this since injecting html here requires implementing `ApplicationHistoryProvider` and can't be done outside of code.

## How was this patch tested?

Manual testing and dev/run-tests

No visible changes to the UI

Author: Alex Bozarth <[email protected]>

Closes apache#15490 from ajbozarth/spark10541.
uzadude pushed a commit to uzadude/spark that referenced this pull request Jan 27, 2017
…eir own text when there aren't any complete apps

## What changes were proposed in this pull request?

I've added a method to `ApplicationHistoryProvider` that returns the html paragraph to display when there are no applications. This allows providers other than `FsHistoryProvider` to determine what is printed. The current hard coded text is now moved into `FsHistoryProvider` since it assumed that's what was being used before.

I chose to make the function return html rather than text because the current text block had inline html in it and it allows a new implementation of `ApplicationHistoryProvider` more versatility. I did not see any security issues with this since injecting html here requires implementing `ApplicationHistoryProvider` and can't be done outside of code.

## How was this patch tested?

Manual testing and dev/run-tests

No visible changes to the UI

Author: Alex Bozarth <[email protected]>

Closes apache#15490 from ajbozarth/spark10541.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants