Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: clickhousesystemtablesreceiver: fix scraper waiting forever after ch downtime #407

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Fix: clickhousesystemtablesreceiver: fix scraper waiting forever after ch downtime #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d888232
chore: clickhouse query logs receiver: test that scrape shouldn't wai…
raj-k-singh Sep 19, 2024
df974a3
fix: ensure uint32 subtraction doesn't cause scraper to wait forever
raj-k-singh Sep 19, 2024
b2f41e4
chore: minor cleanup
raj-k-singh Sep 19, 2024
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
7 changes: 6 additions & 1 deletion receiver/clickhousesystemtablesreceiver/receiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,12 @@ func (r *systemTablesReceiver) scrapeQueryLogIfReady(ctx context.Context) (
// For example, this can happen if this was the first successful scrape
// after several failed attempts and subsequent waits for r.ScrapeIntervalSeconds
nextScrapeMinServerTs := r.nextScrapeIntervalStartTs + r.scrapeIntervalSeconds + r.scrapeDelaySeconds
nextWaitSeconds := max(0, nextScrapeMinServerTs-serverTsNow)

nextWaitSeconds := uint32(0)
if nextScrapeMinServerTs > serverTsNow {
// Do the subtraction only if it will not lead to an overflow/wrap around
nextWaitSeconds = nextScrapeMinServerTs - serverTsNow
}

return nextWaitSeconds, nil
}
Expand Down
10 changes: 10 additions & 0 deletions receiver/clickhousesystemtablesreceiver/receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,14 @@ func TestReceiver(t *testing.T) {
et, exists := lr.Attributes().Get("event_time")
require.True(exists)
require.Equal(et.Str(), testQlEventTime.Format(time.RFC3339))

// should scrape again immediately if scrape is too far behind the server ts
// for example: this can happen if clickhouse goes down for some time
mockQuerrier.tsNow += 10 * testScrapeIntervalSeconds
testQl4 := makeTestQueryLog("host-4", time.Now(), "test query 4")
mockQuerrier.nextScrapeResult = []QueryLog{testQl4}

waitSeconds, err = testReceiver.scrapeQueryLogIfReady(context.Background())
require.Nil(err)
require.Equal(uint32(0), waitSeconds)
}