github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-20 22:10:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Trying out in-place expansion of MapEndpoints

Browse Source
This commit is contained in:
Bryan Boreham
2020-06-21 15:27:24 +00:00
parent 7163f42170
commit 33f4b2a752
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
render/container.go
View File

@@ -69,11 +69,22 @@ func (c connectionJoin) Render(ctx context.Context, rpt report.Report) Nodes {
}
}
}
return MapEndpoints(
func(m report.Node) string {
scope, addr, port, ok := report.ParseEndpointNodeID(m.ID)
local := LocalNetworks(rpt)
ret := newJoinResults(TopologySelector(c.topology).Render(ctx, rpt).Nodes)
for _, n := range rpt.Endpoint.Nodes {
// Nodes without a hostid are mapped to pseudo nodes, if
// possible.
if _, ok := n.Latest.Lookup(report.HostNodeID); !ok {
if id, ok := pseudoNodeID(rpt, n, local); ok {
ret.addChild(n, id, Pseudo)
continue
}
}
{
scope, addr, port, ok := report.ParseEndpointNodeID(n.ID)
if !ok {
return ""
continue
}
id, found := ipNodes[report.MakeScopedEndpointNodeID(scope, addr, "")]
// We also allow for joining on ip:port pairs. This is
@@ -84,16 +95,18 @@ func (c connectionJoin) Render(ctx context.Context, rpt report.Report) Nodes {
id, found = ipNodes[report.MakeScopedEndpointNodeID(scope, addr, port)]
}
if !found || id == "" {
return ""
continue
}
// Not an IP we blanked out earlier.
//
// MapEndpoints is guaranteed to find a node with this id
// addChild() is guaranteed to find a node with this id
// (and hence not have to create one), since we got the id
// from ipNodes, which is populated from c.topology, which
// is where MapEndpoints will look.
return id
}, c.topology).Render(ctx, rpt)
// is where addChild() will look.
ret.addChild(n, id, c.topology)
}
}
return ret.result(rpt.Endpoint.Nodes)
}
// FilterEmpty is a Renderer which filters out nodes which have no children