You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/05/22 17:24:49 UTC
[1/5] flink git commit: Rebuild webUI
Repository: flink
Updated Branches:
refs/heads/release-1.3 95fce1548 -> 30fba2b1a
Rebuild webUI
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/30fba2b1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/30fba2b1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/30fba2b1
Branch: refs/heads/release-1.3
Commit: 30fba2b1adea3d7b8bacb79b63bcdfbd9fa5d833
Parents: f4f5cf1
Author: zentol <ch...@apache.org>
Authored: Fri May 19 12:10:07 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon May 22 19:24:19 2017 +0200
----------------------------------------------------------------------
flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html | 4 ++--
.../web-dashboard/web/partials/taskmanager/index.html | 2 +-
.../web/partials/taskmanager/taskmanager.metrics.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/30fba2b1/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html
index c52d67f..79ff0d3 100644
--- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html
+++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.plan.html
@@ -28,8 +28,8 @@ limitations under the License.
<nav class="navbar navbar-default navbar-secondary-additional">
<ul class="nav nav-tabs">
<li ui-sref-active="active"><a ui-sref=".subtasks({nodeid: nodeid})">Subtasks</a></li>
- <li ui-sref-active="active"><a ui-sref=".taskmanagers({nodeid: nodeid})">TaskManagers</a></li>
- <li ui-sref-active="active"><a ui-sref=".metrics({nodeid: nodeid})">Metrics</a></li>
+ <li ui-sref-active="active"><a ui-sref=".taskmanagers({nodeid: nodeid})">Subtasks by TaskManager</a></li>
+ <li ui-sref-active="active"><a ui-sref=".metrics({nodeid: nodeid})">Task Metrics</a></li>
<li ui-sref-active="active"><a ui-sref=".watermarks({nodeid: nodeid})">Watermarks</a></li>
<li ui-sref-active="active"><a ui-sref=".accumulators({nodeid: nodeid})">Accumulators</a></li>
<li ui-sref-active="active"><a ui-sref=".checkpoints({nodeid: nodeid})">Checkpoints</a></li>
http://git-wip-us.apache.org/repos/asf/flink/blob/30fba2b1/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
index f56dcbe..94614d8 100644
--- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
+++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/index.html
@@ -32,7 +32,7 @@ limitations under the License.
<th>Free Slots</th>
<th>CPU Cores</th>
<th>Physical Memory</th>
- <th>Free Memory</th>
+ <th>JVM Heap Size</th>
<th>Flink Managed Memory</th>
</tr>
</thead>
http://git-wip-us.apache.org/repos/asf/flink/blob/30fba2b1/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
index 3372db8..9be77e9 100644
--- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
+++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
@@ -27,7 +27,7 @@ limitations under the License.
<th>Free Slots</th>
<th>CPU Cores</th>
<th>Physical Memory</th>
- <th>Free Memory</th>
+ <th>JVM Heap Size</th>
<th>Flink Managed Memory</th>
</tr>
</thead>
[5/5] flink git commit: [FLINK-6450][web] Rename "TaskManagers" tab
to "Subtasks by Taskmanager"
Posted by ch...@apache.org.
[FLINK-6450][web] Rename "TaskManagers" tab to "Subtasks by Taskmanager"
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4df9b5a7
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4df9b5a7
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4df9b5a7
Branch: refs/heads/release-1.3
Commit: 4df9b5a7fc15fb00b598bf2d60fd085b93db32bf
Parents: f72b873
Author: zentol <ch...@apache.org>
Authored: Fri May 19 12:03:45 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon May 22 19:24:19 2017 +0200
----------------------------------------------------------------------
flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/4df9b5a7/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
index 6c4cf0b..00a5889 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
@@ -28,7 +28,7 @@ split
a(ui-sref=".subtasks({nodeid: nodeid})") Subtasks
li(ui-sref-active='active')
- a(ui-sref=".taskmanagers({nodeid: nodeid})") TaskManagers
+ a(ui-sref=".taskmanagers({nodeid: nodeid})") Subtasks by TaskManager
li(ui-sref-active='active')
a(ui-sref=".metrics({nodeid: nodeid})") Metrics
[2/5] flink git commit: [FLINK-6451][web] Rename "Metrics" tab to
"Task Metrics"
Posted by ch...@apache.org.
[FLINK-6451][web] Rename "Metrics" tab to "Task Metrics"
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7a9030fe
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7a9030fe
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7a9030fe
Branch: refs/heads/release-1.3
Commit: 7a9030fe94b8c5577422195ae2c3fc29cf4bf680
Parents: 4df9b5a
Author: zentol <ch...@apache.org>
Authored: Fri May 19 12:04:21 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon May 22 19:24:19 2017 +0200
----------------------------------------------------------------------
flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7a9030fe/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
index 00a5889..c7d3142 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.plan.jade
@@ -31,7 +31,7 @@ split
a(ui-sref=".taskmanagers({nodeid: nodeid})") Subtasks by TaskManager
li(ui-sref-active='active')
- a(ui-sref=".metrics({nodeid: nodeid})") Metrics
+ a(ui-sref=".metrics({nodeid: nodeid})") Task Metrics
li(ui-sref-active='active')
a(ui-sref=".watermarks({nodeid: nodeid})") Watermarks
[4/5] flink git commit: [FLINK-6448][web] Rename "Free Memory" field
to "JVM Heap Size"
Posted by ch...@apache.org.
[FLINK-6448][web] Rename "Free Memory" field to "JVM Heap Size"
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f4f5cf13
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f4f5cf13
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f4f5cf13
Branch: refs/heads/release-1.3
Commit: f4f5cf13ea0821658d800cca8be6c02729c23dd9
Parents: 7a9030f
Author: zentol <ch...@apache.org>
Authored: Fri May 19 12:05:10 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon May 22 19:24:19 2017 +0200
----------------------------------------------------------------------
.../web-dashboard/app/partials/taskmanager/index.jade | 2 +-
.../app/partials/taskmanager/taskmanager.metrics.jade | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f4f5cf13/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
index a2b715d..3251fb4 100644
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/taskmanager/index.jade
@@ -33,7 +33,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main
th Free Slots
th CPU Cores
th Physical Memory
- th Free Memory
+ th JVM Heap Size
th Flink Managed Memory
tbody
http://git-wip-us.apache.org/repos/asf/flink/blob/f4f5cf13/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
index e348a5b..fbf170d 100644
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
@@ -25,7 +25,7 @@ div(ng-if="metrics.id")
th Free Slots
th CPU Cores
th Physical Memory
- th Free Memory
+ th JVM Heap Size
th Flink Managed Memory
tbody
tr
[3/5] flink git commit: [FLINK-6610][web] Allow uploadDir to be null
in WebFrontendBootstrap
Posted by ch...@apache.org.
[FLINK-6610][web] Allow uploadDir to be null in WebFrontendBootstrap
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f72b8737
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f72b8737
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f72b8737
Branch: refs/heads/release-1.3
Commit: f72b8737912f5546aa97c3cfcde86d9d1aebc60e
Parents: 95fce15
Author: zentol <ch...@apache.org>
Authored: Fri May 19 14:24:09 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon May 22 19:24:19 2017 +0200
----------------------------------------------------------------------
.../org/apache/flink/runtime/webmonitor/HttpRequestHandler.java | 2 +-
.../flink/runtime/webmonitor/utils/WebFrontendBootstrap.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f72b8737/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java
index d14b7a2..bde9976 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/HttpRequestHandler.java
@@ -126,7 +126,7 @@ public class HttpRequestHandler extends SimpleChannelInboundHandler<HttpObject>
// IF SOMETHING EVER NEEDS POST PARAMETERS, THIS WILL BE THE PLACE TO HANDLE IT
// all fields values will be passed with type Attribute.
- if (data.getHttpDataType() == HttpDataType.FileUpload) {
+ if (data.getHttpDataType() == HttpDataType.FileUpload && tmpDir != null) {
DiskFileUpload file = (DiskFileUpload) data;
if (file.isCompleted()) {
String name = file.getFilename();
http://git-wip-us.apache.org/repos/asf/flink/blob/f72b8737/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java
index 19ec08a..3b3d6cb 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/utils/WebFrontendBootstrap.java
@@ -62,7 +62,7 @@ public class WebFrontendBootstrap {
final Configuration config) throws InterruptedException {
this.router = Preconditions.checkNotNull(router);
this.log = Preconditions.checkNotNull(log);
- this.uploadDir = Preconditions.checkNotNull(directory);
+ this.uploadDir = directory;
this.serverSSLContext = sslContext;
ChannelInitializer<SocketChannel> initializer = new ChannelInitializer<SocketChannel>() {