Skip to content

Commit 801f8fe

Browse files
nblintaonblintao
committed
Merge branch 'master' into linkExecutorToWorker
# Conflicts: # core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scal1a
2 parents 4d1d47f + 8674054 commit 801f8fe

File tree

38 files changed

+1258
-477
lines changed

38 files changed

+1258
-477
lines changed

‎R/pkg/inst/test_support/sparktestjar_2.10-1.0.jar‎

-2.82 KB
Binary file not shown.

‎R/pkg/inst/tests/testthat/jarTest.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
#
1717
library(SparkR)
1818

19-
sparkR.session()
19+
sc <- sparkR.session()
2020

21-
helloTest <- SparkR:::callJStatic("sparkR.test.hello",
21+
helloTest <- SparkR:::callJStatic("sparkrtest.DummyClass",
2222
"helloWorld",
2323
"Dave")
24+
stopifnot(identical(helloTest, "Hello Dave"))
2425

25-
basicFunction <- SparkR:::callJStatic("sparkR.test.basicFunction",
26+
basicFunction <- SparkR:::callJStatic("sparkrtest.DummyClass",
2627
"addStuff",
2728
2L,
2829
2L)
30+
stopifnot(basicFunction == 4L)
2931

3032
sparkR.session.stop()
31-
output <- c(helloTest, basicFunction)
32-
writeLines(output)

‎R/pkg/inst/tests/testthat/test_includeJAR.R‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎core/src/main/resources/org/apache/spark/ui/static/executorspage-template.html‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<script id="executors-summary-template" type="text/html">
19+
<h4 style="clear: left; display: inline-block;">Summary</h4>
20+
<div class="container-fluid">
21+
<div class="container-fluid">
22+
<table id="summary-execs-table" class="table table-striped compact">
23+
<thead>
24+
<th></th>
25+
<th>RDD Blocks</th>
26+
<th><span data-toggle="tooltip"
27+
title="Memory used / total available memory for storage of data like RDD partitions cached in memory. ">Storage Memory</span>
28+
</th>
29+
<th>Disk Used</th>
30+
<th>Cores</th>
31+
<th>Active Tasks</th>
32+
<th>Failed Tasks</th>
33+
<th>Complete Tasks</th>
34+
<th>Total Tasks</th>
35+
<th><span data-toggle="tooltip"
36+
title="Shaded red when garbage collection (GC) time is over 10% of task time">
37+
Task Time (GC Time)</span></th>
38+
<th><span data-toggle="tooltip"
39+
title="Bytes and records read from Hadoop or from Spark storage.">Input</span></th>
40+
<th><span data-toggle="tooltip"
41+
title="Total shuffle bytes and records read (includes both data read locally and data read from remote executors).">
42+
Shuffle Read</span></th>
43+
<th>
44+
<span data-toggle="tooltip" data-placement="left"
45+
title="Bytes and records written to disk in order to be read by a shuffle in a future stage.">
46+
Shuffle Write</span>
47+
</th>
48+
</thead>
49+
<tbody>
50+
</tbody>
51+
</table>
52+
</div>
53+
</div>
54+
<h4 style="clear: left; display: inline-block;">Executors</h4>
55+
<div class="container-fluid">
56+
<div class="container-fluid">
57+
<table id="active-executors-table" class="table table-striped compact">
58+
<thead>
59+
<tr>
60+
<th>
61+
<span data-toggle="tooltip" data-placement="right" title="ID of the executor">Executor ID</span></th>
62+
<th>
63+
<span data-toggle="tooltip" data-placement="top" title="Address">Address</span></th>
64+
<th><span data-toggle="tooltip" data-placement="top" title="Status">Status</span></th>
65+
<th>
66+
<span data-toggle="tooltip" data-placement="top" title="RDD Blocks">RDD Blocks</span></th>
67+
<th>
68+
<span data-toggle="tooltip" data-placement="top"
69+
title="Memory used / total available memory for storage of data like RDD partitions cached in memory.">
70+
Storage Memory</span></th>
71+
<th><span data-toggle="tooltip" data-placement="top" title="Disk Used">Disk Used</span></th>
72+
<th><span data-toggle="tooltip" data-placement="top" title="Cores">Cores</span></th>
73+
<th><span data-toggle="tooltip" data-placement="top" title="Active Tasks">Active Tasks</span></th>
74+
<th><span data-toggle="tooltip" data-placement="top" title="Failed Tasks">Failed Tasks</span></th>
75+
<th><span data-toggle="tooltip" data-placement="top" title="Complete Tasks">Complete Tasks</span></th>
76+
<th><span data-toggle="tooltip" data-placement="top" title="Total Tasks">Total Tasks</span></th>
77+
<th>
78+
<scan data-toggle="tooltip" data-placement="top"
79+
title="Shaded red when garbage collection (GC) time is over 10% of task time">
80+
Task Time (GC Time)
81+
</scan>
82+
</th>
83+
<th><span data-toggle="tooltip" data-placement="top"
84+
title="Bytes and records read from Hadoop or from Spark storage.">Input</span></th>
85+
<th>
86+
<span data-toggle="tooltip" data-placement="top"
87+
title="Total shuffle bytes and records read (includes both data read locally and data read from remote executors).">
88+
Shuffle Read</span></th>
89+
<th>
90+
<!-- Place the shuffle write tooltip on the left (rather than the default position
91+
of on top) because the shuffle write column is the last column on the right side and
92+
the tooltip is wider than the column, so it doesn't fit on top. -->
93+
<span data-toggle="tooltip" data-placement="left"
94+
title="Bytes and records written to disk in order to be read by a shuffle in a future stage.">
95+
Shuffle Write</span></th>
96+
<th><span data-toggle="tooltip" data-placement="left" title="Logs">Logs</span></th>
97+
<th><span data-toggle="tooltip" data-placement="left" title="Thread Dump">Thread Dump</span></th>
98+
<th><span data-toggle="tooltip" data-placement="left" title="Worker">Worker</span></th>
99+
</tr>
100+
</thead>
101+
<tbody>
102+
</tbody>
103+
</table>
104+
</div>
105+
</div>
106+
</script>

0 commit comments

Comments
 (0)