You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/05/09 11:10:33 UTC
spark git commit: [SPARK-7403] [WEBUI] Link URL in objects on
Timeline View is wrong in case of running on YARN
Repository: spark
Updated Branches:
refs/heads/master dda6d9f40 -> 12b95abc7
[SPARK-7403] [WEBUI] Link URL in objects on Timeline View is wrong in case of running on YARN
When we use Spark on YARN and have AllJobPage via ResourceManager's proxy, the link URL in objects which represent each job on timeline view is wrong.
In timeline-view.js, the link is generated as follows.
```
window.location.href = "job/?id=" + getJobId(this);
```
This assumes the URL displayed on the web browser ends with "jobs/" but when we access AllJobPage via the proxy, the url displayed does not end with "jobs/"
The proxy doesn't return status code 301 or 302 so the url displayed still indicates the base url, not "/jobs" even though displaying AllJobPages.
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Closes #5947 from sarutak/fix-link-in-timeline and squashes the following commits:
aaf40e1 [Kousuke Saruta] Added Copyright for vis.js
01bee7b [Kousuke Saruta] Fixed timeline-view.js in order to get correct href
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/12b95abc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/12b95abc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/12b95abc
Branch: refs/heads/master
Commit: 12b95abc7047a8f2fd25a3c8dbb9904eb305eba6
Parents: dda6d9f
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Authored: Sat May 9 10:10:29 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Sat May 9 10:10:29 2015 +0100
----------------------------------------------------------------------
LICENSE | 16 ++++++++++
.../apache/spark/ui/static/timeline-view.css | 3 +-
.../org/apache/spark/ui/static/timeline-view.js | 31 ++++++++------------
3 files changed, 30 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/12b95abc/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index b2001f0..d6b9ccf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -836,6 +836,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+========================================================================
+For vis.js (core/src/main/resources/org/apache/spark/ui/static/vis.min.js):
+========================================================================
+Copyright (C) 2010-2015 Almende B.V.
+
+Vis.js is dual licensed under both
+
+ * The Apache 2.0 License
+ http://www.apache.org/licenses/LICENSE-2.0
+
+and
+
+ * The MIT License
+ http://opensource.org/licenses/MIT
+
+Vis.js may be distributed under either license.
========================================================================
BSD-style licenses
http://git-wip-us.apache.org/repos/asf/spark/blob/12b95abc/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css
index d40de70..d1e6d46 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css
+++ b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.css
@@ -19,7 +19,8 @@ div#application-timeline, div#job-timeline {
margin-bottom: 30px;
}
-#application-timeline div.legend-area {
+#application-timeline div.legend-area,
+#job-timeline div.legend-area {
margin-top: 5px;
}
http://git-wip-us.apache.org/repos/asf/spark/blob/12b95abc/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
index 48fbb33..558beb8 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
@@ -39,23 +39,24 @@ function drawApplicationTimeline(groupArray, eventObjArray, startTime) {
function setupJobEventAction() {
$(".item.range.job.application-timeline-object").each(function() {
- var getJobId = function(baseElem) {
+ var getSelectorForJobEntry = function(baseElem) {
var jobIdText = $($(baseElem).find(".application-timeline-content")[0]).text();
var jobId = jobIdText.match("\\(Job (\\d+)\\)")[1];
- return jobId;
+ return "#job-" + jobId;
};
$(this).click(function() {
- window.location.href = "job/?id=" + getJobId(this);
+ var jobPagePath = $(getSelectorForJobEntry(this)).find("a").attr("href")
+ window.location.href = jobPagePath
});
$(this).hover(
function() {
- $("#job-" + getJobId(this)).addClass("corresponding-item-hover");
+ $(getSelectorForJobEntry(this)).addClass("corresponding-item-hover");
$($(this).find("div.application-timeline-content")[0]).tooltip("show");
},
function() {
- $("#job-" + getJobId(this)).removeClass("corresponding-item-hover");
+ $(getSelectorForJobEntry(this)).removeClass("corresponding-item-hover");
$($(this).find("div.application-timeline-content")[0]).tooltip("hide");
}
);
@@ -97,32 +98,24 @@ function drawJobTimeline(groupArray, eventObjArray, startTime) {
function setupStageEventAction() {
$(".item.range.stage.job-timeline-object").each(function() {
- var getStageIdAndAttempt = function(baseElem) {
+ var getSelectorForStageEntry = function(baseElem) {
var stageIdText = $($(baseElem).find(".job-timeline-content")[0]).text();
var stageIdAndAttempt = stageIdText.match("\\(Stage (\\d+\\.\\d+)\\)")[1].split(".");
- return stageIdAndAttempt;
+ return "#stage-" + stageIdAndAttempt[0] + "-" + stageIdAndAttempt[1];
};
$(this).click(function() {
- var idAndAttempt = getStageIdAndAttempt(this);
- var id = idAndAttempt[0];
- var attempt = idAndAttempt[1];
- window.location.href = "../../stages/stage/?id=" + id + "&attempt=" + attempt;
+ var stagePagePath = $(getSelectorForStageEntry(this)).find("a").attr("href")
+ window.location.href = stagePagePath
});
$(this).hover(
function() {
- var idAndAttempt = getStageIdAndAttempt(this);
- var id = idAndAttempt[0];
- var attempt = idAndAttempt[1];
- $("#stage-" + id + "-" + attempt).addClass("corresponding-item-hover");
+ $(getSelectorForStageEntry(this)).addClass("corresponding-item-hover");
$($(this).find("div.job-timeline-content")[0]).tooltip("show");
},
function() {
- var idAndAttempt = getStageIdAndAttempt(this);
- var id = idAndAttempt[0];
- var attempt = idAndAttempt[1];
- $("#stage-" + id + "-" + attempt).removeClass("corresponding-item-hover");
+ $(getSelectorForStageEntry(this)).removeClass("corresponding-item-hover");
$($(this).find("div.job-timeline-content")[0]).tooltip("hide");
}
);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org