Skip to content

Commit b02fc3e

Browse files
authored
[pkg/stanza] Fix issue where checkpoints could be lost during abrupt shutdown (#29610)
Fixes #29609 Fixes #29491
1 parent 000d044 commit b02fc3e

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: Fix problem where checkpoints could be lost when collector is shutdown abruptly
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: filelogreceiver
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [29609, 29491]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

pkg/stanza/fileconsumer/file.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,12 @@ func (m *Manager) poll(ctx context.Context) {
150150
// Any new files that appear should be consumed entirely
151151
m.readerFactory.FromBeginning = true
152152
if m.persister != nil {
153-
if err := checkpoint.Save(context.Background(), m.persister, m.knownFiles); err != nil {
153+
allCheckpoints := make([]*reader.Metadata, 0, len(m.knownFiles)+len(m.previousPollFiles))
154+
allCheckpoints = append(allCheckpoints, m.knownFiles...)
155+
for _, r := range m.previousPollFiles {
156+
allCheckpoints = append(allCheckpoints, r.Metadata)
157+
}
158+
if err := checkpoint.Save(context.Background(), m.persister, allCheckpoints); err != nil {
154159
m.Errorw("save offsets", zap.Error(err))
155160
}
156161
}

0 commit comments

Comments
 (0)