Fix high CPU on retries in json_batch mode #89
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jsvd
reviewed
Jul 6, 2018
lib/logstash/outputs/http.rb
Outdated
| pending = Queue.new | ||
| events.each {|e| pending << [e, 0]} | ||
| if @format == "json_batch" | ||
| pending << [events, 0, true] |
There was a problem hiding this comment.
By setting a @is_batch variable (w/ a is_batch accessor) to true or false based on the :format parameter during the register method we can avoid passing it around in multiple places, greatly simplifying the code. wdyt?
jsvd
reviewed
Jul 6, 2018
lib/logstash/outputs/http.rb
Outdated
|
|
||
| # Compress the body and add appropriate header | ||
| if @http_compression == true | ||
| if @http_compression == true && !@is_batch |
There was a problem hiding this comment.
I know this is to keep current behaviour but the current behaviour is a bug so we can fix it here too, also replacing #88 (just by removing this change now that the code path is shared.
jsvd
reviewed
Jul 6, 2018
CHANGELOG.md
Outdated
| @@ -1,3 +1,6 @@ | |||
| ## 5.2.2 | |||
| - Fix high CPU usage on retries in json_batch mode. | |||
There was a problem hiding this comment.
sorry, one last detail, can you add the this pr's reference to the changelog entry? we have guidelines for editing the changelog here (these guidelines are somewhat recent we need to make them easier to find).
jsvd
approved these changes
Jul 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The high CPU on retries occurred because there was a separate code path for
json_batchmode where retries were attempted in a hot loop. This PR unifies those code paths so that the proper back-off behavior is applied to retries in all modes.Fixes #86, #88.