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

Fix race condition #117 #168

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fix race condition #117 #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/batcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,21 @@ class Batcher {
}
}

const savedBatchStreams = this.batch.streams

// No need to clear the batch if batching is disabled
logEntry === undefined && this.clearBatch()

// Send the data to Grafana Loki
req.post(this.url, this.contentType, this.options.headers, reqBody, this.options.timeout, this.options.httpAgent, this.options.httpsAgent)
.then(() => {
// No need to clear the batch if batching is disabled
logEntry === undefined && this.clearBatch()
this.batchSent()
resolve()
})
.catch(err => {
// Revert batch for the logs to be sent on the next iteration
this.batch.streams = savedBatchStreams
Copy link
Owner

@JaniAnttonen JaniAnttonen Dec 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, took a while to look at this, but doesn't this just reintroduce the same race condition but in a new place? You'd need to combine the savedBatchStreams & this.batch.streams in a nonduplicative and a nondestructive manner, like merging sets.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sure fixes the problem so that it only happens when the request fails which decreases its frequency quite a bit. I'll draft something based on this :)


// Clear the batch on error if enabled
this.options.clearOnError && this.clearBatch()

Expand Down