Skip to content

Commit

Permalink
[8.15](backport #41071) Missing backup and delete for AWS S3 polling …
Browse files Browse the repository at this point in the history
…mode (#41122)

* Missing backup and delete for AWS S3 polling mode (#41071)

(cherry picked from commit f47cbd6)


---------

Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
  • Loading branch information
mergify[bot] and kaiyan-sheng authored Oct 7, 2024
1 parent fa798fc commit 66d53cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Prevent GCP Pub/Sub input blockage by increasing default value of `max_outstanding_messages` {issue}35029[35029] {pull}38985[38985]
- Updated Websocket input title to align with existing inputs {pull}39006[39006]
- Fix replace processor handling of zero string replacement validation. {pull}40751[40751]
- Add backup and delete for AWS S3 polling mode feature back. {pull}41071[41071]

*Heartbeat*

Expand Down
4 changes: 4 additions & 0 deletions x-pack/filebeat/input/awss3/s3_input.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ func (in *s3PollerInput) workerLoop(ctx context.Context, workChan <-chan *s3Fetc

// Metrics
in.metrics.s3ObjectsAckedTotal.Inc()

if finalizeErr := objHandler.FinalizeS3Object(); finalizeErr != nil {
in.log.Errorf("failed finalizing objects from S3 bucket (manual cleanup is required): %w", finalizeErr)
}
}
}

Expand Down

0 comments on commit 66d53cc

Please sign in to comment.