Skip to content

Cherry-pick #15545 to 7.x: [Filebeat] Handle error message in handleS3Objects function#15558

Merged
kaiyan-sheng merged 3 commits intoelastic:7.xfrom
kaiyan-sheng:backport_15545_7.x
Jan 15, 2020
Merged

Cherry-pick #15545 to 7.x: [Filebeat] Handle error message in handleS3Objects function#15558
kaiyan-sheng merged 3 commits intoelastic:7.xfrom
kaiyan-sheng:backport_15545_7.x

Conversation

@kaiyan-sheng
Copy link
Copy Markdown
Contributor

Cherry-pick of PR #15545 to 7.x branch. Original message:

When error occurred from reader.ReadString, error message originally got returned from calling handleS3Objects function but did not store the error into the error channel successfully. With this change, error message will be passed into the error channel and the same error channel will be closed.

* Handle error message in handleS3Objects function

* remove s3Context.Fail and use setError and done instead

* Add changelog

(cherry picked from commit 2228af4)
@kaiyan-sheng kaiyan-sheng merged commit df2480a into elastic:7.x Jan 15, 2020
@kaiyan-sheng kaiyan-sheng deleted the backport_15545_7.x branch January 15, 2020 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants