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

Filebeat gcs input addFiledJobs panic protection #38407

Merged
merged 3 commits into from
Mar 20, 2024
+2 −0
Merged

Filebeat gcs input addFiledJobs panic protection #38407

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
171414c
Filebeat gcs input addFiledJobs panic protection
adassow Mar 19, 2024
26609d1
Update CHANGELOG-developer.next.asciidoc
adassow Mar 19, 2024
193054b
Merge branch 'main' into patch-1
ShourieG Mar 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
1 change: 1 addition & 0 deletions CHANGELOG-developer.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
- Make winlogbeat/sys/wineventlog follow the unsafe.Pointer rules. {pull}36650[36650]
- Cleaned up documentation errors & fixed a minor bug in Filebeat Azure blob storage input. {pull}36714[36714]
- Fix copy arguments for strict aligned architectures. {pull}36976[36976]
- Fix filebit gcs input panic {pull}38407[38407]
Copy link
Member

Choose a reason for hiding this comment

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

This entry should be added to CHANGELOG.next.asciidoc. The "developer" file is focused mainly on API changes or internal-only fixes (without a user impact).

filebit -> filebeat

Copy link
Contributor

Choose a reason for hiding this comment

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

I will create a PR to shift this around, since auto merge was enabled and it got merged.

Copy link
Contributor

Choose a reason for hiding this comment

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

#38512


==== Added

Expand Down
1 change: 1 addition & 0 deletions x-pack/filebeat/input/gcs/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ func (s *scheduler) addFailedJobs(ctx context.Context, jobs []*job) []*job {
obj, err := s.bucket.Object(name).Attrs(ctx)
if err != nil {
s.log.Errorf("adding failed job %s to job list caused an error: %w", err)
continue
}

objectURI := "gs://" + s.src.BucketName + "/" + obj.Name
Expand Down
Loading