You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/11/07 14:08:12 UTC
[14/30] flink git commit: [FLINK-7862] Change web ui to calculate
total memory from heap and non-heap data
[FLINK-7862] Change web ui to calculate total memory from heap and non-heap data
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1c78dee0
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1c78dee0
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1c78dee0
Branch: refs/heads/master
Commit: 1c78dee08dcdb06205bab4ac6c02059295bb6c51
Parents: e56135d
Author: Till Rohrmann <tr...@apache.org>
Authored: Thu Oct 19 14:00:07 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Tue Nov 7 15:07:43 2017 +0100
----------------------------------------------------------------------
.../app/partials/taskmanager/taskmanager.metrics.jade | 6 +++---
flink-runtime-web/web-dashboard/web/js/hs/index.js | 4 ++--
flink-runtime-web/web-dashboard/web/js/index.js | 4 ++--
.../web/partials/taskmanager/taskmanager.metrics.html | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1c78dee0/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 290b524..1818ad8 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
@@ -60,9 +60,9 @@ div(ng-if="metrics.id")
td {{ metrics.metrics.nonHeapMax | humanizeBytes }}
tr
td Total
- td {{ metrics.metrics.totalCommitted | humanizeBytes }}
- td {{ metrics.metrics.totalUsed | humanizeBytes }}
- td {{ metrics.metrics.totalMax | humanizeBytes }}
+ td {{ metrics.metrics.heapCommitted + metrics.metrics.nonHeapCommitted | humanizeBytes }}
+ td {{ metrics.metrics.heapUsed + metrics.metrics.nonHeapUsed | humanizeBytes }}
+ td {{ metrics.metrics.heapMax + metrics.metrics.nonHeapMax | humanizeBytes }}
h2 Outside JVM
table.table.table-properties