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

fix (probe): skip publishing empty reports

Browse Source 
If the probe is configured with `spy.interval` greater than
`publish.interval`, the report to be published can be completely
blank.  In that case, skip publishing it so the next time we do have
some data the time-window is correct.
This commit is contained in:
Bryan Boreham
2020-03-26 20:23:43 +00:00
parent b3f212755b
commit 951d7a1412
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
probe/probe.go
View File

@@ -213,14 +213,16 @@ func (p *Probe) tag(r report.Report) report.Report {
return r
}
func (p *Probe) drainAndSanitise(rpt report.Report, rs chan report.Report) report.Report {
func (p *Probe) drainAndSanitise(rpt report.Report, rs chan report.Report) (report.Report, int) {
p.rateLimiter.Wait(context.Background())
rpt = rpt.Copy()
count := 0
ForLoop:
for {
select {
case r := <-rs:
rpt.UnsafeMerge(r)
count++
default:
break ForLoop
}
@@ -231,7 +233,7 @@ ForLoop:
t.Controls = report.Controls{}
})
}
return rpt
return rpt, count
}
func (p *Probe) publishLoop() {
@@ -245,7 +247,11 @@ func (p *Probe) publishLoop() {
var err error
select {
case <-pubTick:
rpt := p.drainAndSanitise(report.MakeReport(), p.spiedReports)
rpt, count := p.drainAndSanitise(report.MakeReport(), p.spiedReports)
if count == 0 {
continue // No data has been collected - don't bother publishing.
}
fullReport := (publishCount % p.ticksPerFullReport) == 0
if !fullReport {
rpt.UnsafeUnMerge(lastFullReport)
@@ -264,7 +270,7 @@ func (p *Probe) publishLoop() {
}
case rpt := <-p.shortcutReports:
rpt = p.drainAndSanitise(rpt, p.shortcutReports)
rpt, _ = p.drainAndSanitise(rpt, p.shortcutReports)
err = p.publisher.Publish(rpt)
case <-p.quit: