Skip to content

Commit 81a426a

Browse files
authored
[receiver/filelog] Fix bug where max_concurrent_files: 1 caused receiver to freeze (#39599)
Resolves #39598
1 parent b27ccc6 commit 81a426a

File tree

3 files changed

+54
-1
lines changed

3 files changed

+54
-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: filelogreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix frozen receiver when max_concurrent_files is 1
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: [39598]
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/config.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,18 @@ func (c Config) Build(set component.TelemetrySettings, emit emit.Callback, opts
175175
if err != nil {
176176
return nil, err
177177
}
178+
179+
maxBatchFiles := c.MaxConcurrentFiles / 2
180+
if maxBatchFiles == 0 {
181+
maxBatchFiles = 1
182+
}
183+
178184
return &Manager{
179185
set: set,
180186
readerFactory: readerFactory,
181187
fileMatcher: fileMatcher,
182188
pollInterval: c.PollInterval,
183-
maxBatchFiles: c.MaxConcurrentFiles / 2,
189+
maxBatchFiles: maxBatchFiles,
184190
maxBatches: c.MaxBatches,
185191
telemetryBuilder: telemetryBuilder,
186192
noTracking: o.noTracking,

pkg/stanza/fileconsumer/file_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,26 @@ func TestFileBatching(t *testing.T) {
881881
require.ElementsMatch(t, expectedTokens, actualTokens)
882882
}
883883

884+
func TestMaxConcurrentFilesOne(t *testing.T) {
885+
t.Parallel()
886+
887+
tempDir := t.TempDir()
888+
889+
temp1 := filetest.OpenTemp(t, tempDir)
890+
_, err := temp1.WriteString("file 0: written before start\n")
891+
require.NoError(t, err)
892+
893+
cfg := NewConfig().includeDir(tempDir)
894+
cfg.StartAt = "beginning"
895+
cfg.MaxConcurrentFiles = 1
896+
897+
sink := emittest.NewSink()
898+
operator := testManagerWithSink(t, cfg, sink)
899+
operator.persister = testutil.NewUnscopedMockPersister()
900+
operator.poll(context.Background())
901+
sink.ExpectTokens(t, []byte("file 0: written before start"))
902+
}
903+
884904
func TestFileBatchingRespectsStartAtEnd(t *testing.T) {
885905
t.Parallel()
886906

0 commit comments

Comments
 (0)