Skip to content

Commit

Permalink
WIP. Cluster info tab + one data file
Browse files Browse the repository at this point in the history
  • Loading branch information
@NSAmelchev
NSAmelchev committed May 28, 2020
1 parent c2d1c73 commit 138642a
Show file tree
Hide file tree
Showing 13 changed files with 245 additions and 197 deletions.
6 changes: 4 additions & 2 deletions modules/core/src/main/java/org/apache/ignite/internal/profiling/LogFileProfiling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ public synchronized void startProfiling(long maxFileSize, int bufferSize, int fl

profilingStart(ctx.localNodeId(), ctx.igniteInstanceName(), IgniteVersionUtils.VER_STR, U.currentTimeMillis());

for (GridCacheContext cctx : ctx.cache().context().cacheContexts())
cacheStart(cctx.cacheId(), cctx.startTime(), cctx.name(), cctx.config().getGroupName(), cctx.userCache());
ctx.cache().context().cacheContexts().stream()
.filter(GridCacheContext::started)
.forEach(cctx -> cacheStart(cctx.cacheId(), cctx.startTime(), cctx.name(), cctx.config().getGroupName(),
cctx.userCache()));
}

/** Stops profiling. */
Expand Down
36 changes: 20 additions & 16 deletions modules/profiling/report/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@
<div class="sidebar-sticky">
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#cacheOperationsTab" role="tab"
aria-selected="true">Cache operations</a>
<a class="nav-link active" data-toggle="tab" href="#clusterInfoTab" role="tab"
aria-selected="true">Cluster info</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#cacheOperationsTab" role="tab"
aria-selected="false">Cache operations</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#txOperationsTab" role="tab"
Expand All @@ -81,7 +85,17 @@

<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-4">
<div class="tab-content">
<div class="tab-pane fade show active" id="cacheOperationsTab" role="tabpanel">
<div class="tab-pane fade show active" id="clusterInfoTab" role="tabpanel">
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Cluster info</h1>
</div>

<h2 class="mt-4">Cluster nodes</h2>
<table data-toggle="table" id="nodesTable"></table>
<h2 class="mt-4">Started caches</h2>
<table data-toggle="table" id="cachesTable"></table>
</div>
<div class="tab-pane fade" id="cacheOperationsTab" role="tabpanel">
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Cache operations statistics</h1>
</div>
Expand Down Expand Up @@ -159,21 +173,11 @@ <h2 class="mt-4">Top of slowest tasks</h2>
<!-- Bootstrap select. -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>

<!-- TODO async load -->
<script type="text/javascript" src="data/ops.json.js"></script>
<script type="text/javascript" src="data/sql.json.js"></script>
<script type="text/javascript" src="data/scan.json.js"></script>
<script type="text/javascript" src="data/startedCaches.json.js"></script>
<script type="text/javascript" src="data/topSlowSql.json.js"></script>
<script type="text/javascript" src="data/topSlowScan.json.js"></script>
<script type="text/javascript" src="data/tx.json.js"></script>
<script type="text/javascript" src="data/txHistogram.json.js"></script>
<script type="text/javascript" src="data/txHistogramBuckets.json.js"></script>
<script type="text/javascript" src="data/totalCompute.json.js"></script>
<script type="text/javascript" src="data/topSlowCompute.json.js"></script>
<script type="text/javascript" src="data/topology.json.js"></script>
<!-- Report data. -->
<script type="text/javascript" src="data/data.json.js"></script>

<script type="text/javascript" src="js/utils.js"></script>
<script type="text/javascript" src="js/clusterInfoTab.js"></script>
<script type="text/javascript" src="js/operationsTab.js"></script>
<script type="text/javascript" src="js/sqlTab.js"></script>
<script type="text/javascript" src="js/scanTab.js"></script>
Expand Down
96 changes: 96 additions & 0 deletions modules/profiling/report/js/clusterInfoTab.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* 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.
*/

$('#nodesTable').bootstrapTable({
pagination: true,
search: true,
columns: [{
field: 'name',
title: 'Node name',
sortable: true
}, {
field: 'verson',
title: 'Node verson',
sortable: true
}, {
field: 'nodeId',
title: 'Node ID',
sortable: true
}],
data: prepareNodesTableData(),
sortName: 'name',
sortOrder: 'desc'
})

function prepareNodesTableData() {
var data = [];

$.each(REPORT_DATA.clusterInfo.nodes, function (nodeId, node) {
data.push({
"nodeId": nodeId,
"name": node.name,
"verson": node.verson
});
});

return data;
}

$('#cachesTable').bootstrapTable({
pagination: true,
search: true,
columns: [{
field: 'cacheName',
title: 'Cache name',
sortable: true
}, {
field: 'groupName',
title: 'Group name',
sortable: true
}, {
field: 'startTime',
title: 'Start time',
sortable: true
}, {
field: 'userCache',
title: 'User cache',
sortable: true
}, {
field: 'cacheId',
title: 'Cache ID',
sortable: true
}],
data: prepareCachesTableData(),
sortName: 'cacheName',
sortOrder: 'desc'
})

function prepareCachesTableData() {
var data = [];

$.each(REPORT_DATA.clusterInfo.caches, function (cacheId, cache) {
data.push({
"cacheId": cacheId,
"startTime": new Date(cache.startTime),
"cacheName": cache.cacheName,
"groupName": cache.groupName,
"userCache": cache.userCache
});
});

return data;
}
18 changes: 9 additions & 9 deletions modules/profiling/report/js/computeTab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ $('#computeStatisticsTable').bootstrapTable({

/** Tasks statistics table data. */
function prepareComputeTableData() {
var res = [];
var data = [];

$.each(report_totalCompute, function (taskName, taskData) {
res.push({
$.each(REPORT_DATA.totalCompute, function (taskName, taskData) {
data.push({
"taskName": taskName,
"count": taskData["count"],
"duration": taskData["duration"],
Expand All @@ -59,7 +59,7 @@ function prepareComputeTableData() {
});
});

return res;
return data;
}

/** Builds top slow task table. */
Expand Down Expand Up @@ -105,10 +105,10 @@ $('#topSlowComputeTable').bootstrapTable({

/** Top of slow tasks table data. */
function prepareSlowTasksTableData() {
var res = [];
var data = [];

$.each(report_topSlowCompute, function (k, sqlData) {
res.push({
$.each(REPORT_DATA.topSlowCompute, function (k, sqlData) {
data.push({
taskName: sqlData["taskName"],
duration: sqlData["duration"],
startTime: new Date(sqlData["startTime"]),
Expand All @@ -119,12 +119,12 @@ function prepareSlowTasksTableData() {
});
});

return res;
return data;
}

/** Builds jobs statistics subtable. */
function buildJobsSubTable($el, index) {
var jobs = report_topSlowCompute[index]["jobs"];
var jobs = REPORT_DATA.topSlowCompute[index]["jobs"];

var data = [];

Expand Down
22 changes: 11 additions & 11 deletions modules/profiling/report/js/operationsTab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,25 @@ function prepareCacheDatasets(opName) {
var cacheId = searchCachesSelect.val();
var nodeId = searchNodesSelect.val();

var res = [];
var datasets = [];

var totalCacheStat = report_ops[nodeId] === undefined ? undefined : report_ops[nodeId][cacheId];
var cacheOps = REPORT_DATA.cacheOps[nodeId] === undefined ? undefined : REPORT_DATA.cacheOps[nodeId][cacheId];

if (totalCacheStat === undefined)
return res;
if (cacheOps === undefined)
return datasets;

var data0 = [];
var datasetData = [];

$.each(totalCacheStat[opName], function (k, arr) {
data0.push({t: parseInt(arr[0]), y: arr[1]})
$.each(cacheOps[opName], function (k, arr) {
datasetData.push({t: parseInt(arr[0]), y: arr[1]})

opsCountPerType[opName] += arr[1];
});

sortByKeyAsc(data0, "t");
sortByKeyAsc(datasetData, "t");

var dataset = {
data: data0,
data: datasetData,
label: "Count of " + opName,
lineTension: 0,
backgroundColor: 'transparent',
Expand All @@ -132,9 +132,9 @@ function prepareCacheDatasets(opName) {
pointBackgroundColor: CACHE_OPERATIONS_COLORS[opName],
};

res.push(dataset);
datasets.push(dataset);

return res;
return datasets;
}

function drawCacheBar() {
Expand Down
16 changes: 8 additions & 8 deletions modules/profiling/report/js/scanTab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ $('#scanStatisticsTable').bootstrapTable({
})

function prepareScanTableData() {
var res = [];
var data = [];

$.each(report_scan, function (cacheName, sqlData) {
res.push({
$.each(REPORT_DATA.scan, function (cacheName, sqlData) {
data.push({
"cacheName": cacheName,
"count": numberWithCommas(sqlData["count"]),
"duration": numberWithCommas(sqlData["duration"]),
Expand All @@ -62,7 +62,7 @@ function prepareScanTableData() {
});
});

return res;
return data;
}

$('#topSlowScanTable').bootstrapTable({
Expand Down Expand Up @@ -104,10 +104,10 @@ $('#topSlowScanTable').bootstrapTable({
})

function prepareSlowScanTableData() {
var res = [];
var data = [];

$.each(report_topSlowScan, function (key, sqlData) {
res.push({
$.each(REPORT_DATA.topSlowScan, function (key, sqlData) {
data.push({
text: sqlData["text"],
duration: numberWithCommas(sqlData["duration"]),
startTime: new Date(sqlData["startTime"]),
Expand All @@ -118,5 +118,5 @@ function prepareSlowScanTableData() {
});
});

return res;
return data;
}
16 changes: 8 additions & 8 deletions modules/profiling/report/js/sqlTab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ $('#sqlStatisticsTable').bootstrapTable({
})

function prepareSqlTableData() {
var res = [];
var data = [];

$.each(report_sql, function (queryText, sqlData) {
res.push({
$.each(REPORT_DATA.sql, function (queryText, sqlData) {
data.push({
"text": queryText,
"count": sqlData["count"],
"duration": sqlData["duration"],
Expand All @@ -62,7 +62,7 @@ function prepareSqlTableData() {
});
});

return res;
return data;
}

$('#topSlowSqlTable').bootstrapTable({
Expand Down Expand Up @@ -104,10 +104,10 @@ $('#topSlowSqlTable').bootstrapTable({
})

function prepareSlowSqlTableData() {
var res = [];
var data = [];

$.each(report_topSlowSql, function (key, sqlData) {
res.push({
$.each(REPORT_DATA.topSlowSql, function (key, sqlData) {
data.push({
text: sqlData["text"],
duration: sqlData["duration"],
startTime: new Date(sqlData["startTime"]),
Expand All @@ -118,5 +118,5 @@ function prepareSlowSqlTableData() {
});
});

return res;
return data;
}
Loading

0 comments on commit 138642a

Please sign in to comment.