Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Fix for missing physical plan in UI #3786

Merged
merged 85 commits into from
Apr 12, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
8536fde
Fix for missing physical plan in UI
nicknezis Mar 2, 2022
9cd8e23
Fix the Heron UI timeline metrics
nicknezis Mar 2, 2022
6c84aa8
Reverting the tracker API back to previous calls
nicknezis Mar 3, 2022
dd23309
More cleanup to make the UI metricstimeline work
nicknezis Mar 3, 2022
7e3eeb4
Cleaning up the REST API structure
nicknezis Mar 4, 2022
feb4fe6
Various heron-tracker fixes
nicknezis Mar 6, 2022
32d339e
More fixes
nicknezis Mar 7, 2022
c7dcdb2
Rolling back a change
nicknezis Mar 7, 2022
c95e926
Typo fix
nicknezis Mar 7, 2022
2672575
typo
thinker0 Mar 8, 2022
ab144e3
Add check eliments
thinker0 Mar 8, 2022
a67e4f2
Fix typos (#3788)
thinker0 Mar 8, 2022
42acd57
Merge remote-tracking branch 'thinker/tracker-fixes-1' into nicknezis…
nicknezis Mar 9, 2022
6b93384
Fix name mismatch
nicknezis Mar 9, 2022
3542351
Removed EnvelopeAPI Router which was not working
nicknezis Mar 9, 2022
0560c8e
More fixes
nicknezis Mar 14, 2022
5dc7d2e
Updated AckingTopology to not burn so much CPU
nicknezis Mar 14, 2022
59ce8b4
More potential fixes
nicknezis Mar 15, 2022
5388489
Update heron/tools/common/src/python/clients/tracker.py
nicknezis Mar 26, 2022
d92ad26
Update heron/tools/common/src/python/clients/tracker.py
nicknezis Mar 26, 2022
72769a3
Update heron/tools/tracker/src/python/app.py
nicknezis Mar 26, 2022
a1d46ab
Update heron/tools/tracker/src/python/tracker.py
nicknezis Mar 26, 2022
eddf0a3
Update heron/tools/tracker/src/python/app.py
nicknezis Mar 26, 2022
322818f
Merge commit '8841d1c4d6b3156a40ffed856fb32c1ceb682855' into nicknezi…
nicknezis Mar 26, 2022
234240c
Fixing the Tracker client URIs
nicknezis Mar 27, 2022
771892a
Whitespace style check
nicknezis Mar 27, 2022
64e35fe
[Tracker|Shell] cleaning up imports.
surahman Mar 27, 2022
cf77242
[Tracker] whitespace fix.
surahman Mar 27, 2022
9aa4091
[Tracker] setting global Log
surahman Mar 27, 2022
4b17564
[UI] setting global Log
surahman Mar 27, 2022
f417981
[UI] white space fixes.
surahman Mar 27, 2022
69528d0
[UI] switching to `None` check for failure.
surahman Mar 28, 2022
fc8efab
[UI] fixing issues with dict causing CI errors.
surahman Mar 28, 2022
4acae44
Added tracker server performance timing info in header
nicknezis Apr 2, 2022
56416b2
Fix for metrics timeline
nicknezis Apr 2, 2022
cbac2df
Updated the unit tests
nicknezis Apr 2, 2022
1723c15
Updated pylint to fix Python 3.9 issues
nicknezis Apr 2, 2022
df97725
Whole lot of formatting changes
nicknezis Apr 3, 2022
1533dea
Fix compile error
nicknezis Apr 3, 2022
028f87f
[Examples] word spout syntax fix.
surahman Apr 3, 2022
4cdfa6d
[Style] utils.topology.topology_context_impl
surahman Apr 3, 2022
30d7b6d
[Style] utils.misc.serializer_helper
surahman Apr 3, 2022
aa052d3
[Style] utils.misc.pplan_helper
surahman Apr 3, 2022
fcc7408
[Style] utils.misc.communicator
surahman Apr 3, 2022
3ef6cce
[Style] utils.metrics.py_metrics
surahman Apr 3, 2022
9846985
[Style] utils.metrics.metrics_helper
surahman Apr 3, 2022
2b825c6
[Style] network.socket_options
surahman Apr 3, 2022
0c8d2fc
[Style] network.protocol
surahman Apr 3, 2022
7a8927e
[Style] network.metricsmgr_client
surahman Apr 3, 2022
4ba503c
[Style] network.heron_client
surahman Apr 3, 2022
ebd9f75
[Style] network.gateway_looper
surahman Apr 3, 2022
fc3d531
More style fixes
nicknezis Apr 3, 2022
0d3e833
[Style] instance
surahman Apr 3, 2022
8456e58
[Style] basics.spout_instance
surahman Apr 3, 2022
3967c80
[Style] basics.bolt_instance
surahman Apr 3, 2022
47682fd
[Style] basics.base_instance
surahman Apr 3, 2022
e7e673e
[Style] utils.metrics.py_metrics
surahman Apr 3, 2022
7417292
[Style] fixes to super() calls.
surahman Apr 3, 2022
483915e
Merge branch 'master' into nicknezis/tracker-fixes
surahman Apr 3, 2022
b9fd15f
More style cleanup
nicknezis Apr 3, 2022
6b87e26
More lint related style fixes
nicknezis Apr 3, 2022
731fb95
More fixes
nicknezis Apr 3, 2022
d9b1a92
More fixes
nicknezis Apr 3, 2022
34e3759
Typo fix
nicknezis Apr 3, 2022
1a3e1b7
More fixes
nicknezis Apr 3, 2022
ffc1af5
More fixes
nicknezis Apr 3, 2022
df11d8c
One more fix
nicknezis Apr 3, 2022
8af12c0
More fixes
nicknezis Apr 4, 2022
708734d
Fixing local integration test
nicknezis Apr 4, 2022
c8d35a6
Convert memory value to int to fix test issue
nicknezis Apr 7, 2022
32a67dd
More style fixes and type conversion to correct string interpolation
nicknezis Apr 7, 2022
c395071
Another fix to enforce `int` type
nicknezis Apr 7, 2022
1a4fe04
Typo fix
nicknezis Apr 7, 2022
1cf27d9
Remove import that IDE auto added
nicknezis Apr 7, 2022
e30e6ba
Update heron/statemgrs/src/python/statemanager.py
nicknezis Apr 8, 2022
52c9401
Update heronpy/connectors/pulsar/pulsarstreamlet.py
nicknezis Apr 8, 2022
1525256
Fixes based on feedback
nicknezis Apr 8, 2022
ba1aaec
Putting back to original logic
nicknezis Apr 8, 2022
403f32c
[UI] removing global reference to Log
surahman Apr 8, 2022
4492c48
timeline values seem to be of float type
nicknezis Apr 9, 2022
54af1df
More fixes
nicknezis Apr 10, 2022
aa896a9
Whitespace fix
nicknezis Apr 10, 2022
0abd309
Updating dictionary creation to bypass intermediate list creation
nicknezis Apr 10, 2022
dda9349
Returning the logic to original form with direct return of dict
nicknezis Apr 11, 2022
5df20a8
typo (#3814)
thinker0 Apr 11, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions heron/tools/ui/resources/static/js/exceptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ var InstanceExceptionLogs = React.createClass({
}
if (instanceInfo) {
var logfile = instanceInfo.logfile;
var stmgrId = instanceInfo.stmgrId;
var jobUrl = pplan.stmgrs[stmgrId].joburl;
var host = "http://" + pplan.stmgrs[stmgrId].host + ":1338";
var stmgr_id = instanceInfo.stmgr_id;
var jobUrl = pplan.stmgrs[stmgr_id].joburl;
var host = "http://" + pplan.stmgrs[stmgr_id].host + ":1338";
mainLinks = mainLinks.concat([['Logs', logfile], ['Aurora', jobUrl], ['Host', host]]);
}
}
Expand Down
2 changes: 1 addition & 1 deletion heron/tools/ui/resources/static/js/physical-plan.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
for (var wk in instances) {
var worker = instances[wk];
if (worker.name === comp) {
containers[worker.stmgrId].children.push(worker);
containers[worker.stmgr_id].children.push(worker);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion heron/tools/ui/resources/static/js/plan-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function PlanController(baseUrl, cluster, environ, toponame, physicalPlan, logic
var containers = {}, instances = {};
d3instances.each(function (d) {
if (!d3.select(this).classed('fade')) {
containers[d.stmgrId] = true;
containers[d.stmgr_id] = true;
instances[d.id] = true;
}
});
Expand Down
2 changes: 1 addition & 1 deletion heron/tools/ui/resources/static/js/plan-stats.js
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
}

function createMetricsUrl(metric, component, instance, start, end) {
var url = baseUrl + '/topologies/metrics/timeline?';
var url = baseUrl + '/topologies/metricstimeline?';
return [
url + 'cluster=' + cluster,
'environ=' + environ,
Expand Down
2 changes: 1 addition & 1 deletion heron/tools/ui/resources/static/js/stat-trendlines.js
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ function StatTrendlines(baseUrl, cluster, environ, toponame, physicalPlan, logic
executeMetricsQuery();

function executeMetricsQuery() {
var u = baseUrl + '/topologies/metrics/timeline?'
var u = baseUrl + '/topologies/metricstimeline?'
var request = [
u + 'cluster=' + cluster,
'environ=' + environ,
Expand Down
4 changes: 2 additions & 2 deletions heron/tools/ui/resources/static/js/topologies.js
Original file line number Diff line number Diff line change
Expand Up @@ -1480,8 +1480,8 @@ var InstanceCounters = React.createClass({
}
}
if (instanceInfo) {
var stmgrId = instanceInfo.stmgrId;
var container = stmgrId.split("-")[1]
var stmgr_id = instanceInfo.stmgr_id;
var container = stmgr_id.split("-")[1]
var topologyParams = this.props.info.cluster + '/' + this.props.info.environ
+ '/' + this.props.info.topology
var instanceParams = topologyParams + '/' + instanceInfo.id
Expand Down
10 changes: 5 additions & 5 deletions heron/tools/ui/src/python/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def metrics(
return result

query_handler = tracker.HeronQueryHandler()
@topologies_router.get("/metrics/timeline")
@topologies_router.get("/metricstimeline")
def timeline(
cluster: str,
environ: str,
Expand Down Expand Up @@ -462,7 +462,7 @@ def pid_snippet(
) -> Response:
"""Render a HTML snippet containing topology output of container."""
physical_plan = tracker.get_physical_plan(cluster, environment, topology)
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
"host"
]
info = tracker.get_instance_pid(cluster, environment, topology, instance)
Expand Down Expand Up @@ -492,7 +492,7 @@ def jstack_snippet(
) -> HTMLResponse:
"""Render a HTML snippet containing jstack output of container."""
physical_plan = tracker.get_physical_plan(cluster, environment, topology)
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
"host"
]
info = tracker.get_instance_jstack(cluster, environment, topology, instance)
Expand Down Expand Up @@ -521,7 +521,7 @@ def jmap_snippet(
) -> HTMLResponse:
"""Render a HTML snippet containing jmap output of container."""
physical_plan = tracker.get_physical_plan(cluster, environment, topology)
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
"host"
]
info = tracker.run_instance_jmap(cluster, environment, topology, instance)
Expand Down Expand Up @@ -558,7 +558,7 @@ def histogram_snippet(
"""Render a HTML snippet containing jmap histogram output of container."""
# use a function to DRY up these container API methods
physical_plan = tracker.get_physical_plan(cluster, environment, topology)
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgrId"]][
host = physical_plan["stmgrs"][physical_plan["instances"][instance]["stmgr_id"]][
"host"
]
info = tracker.get_instance_mem_histogram(
Expand Down