queue drain option support #6433
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
|
Looks good to me so far. I was planning to port the Q clients to Java/JRuby soon anyway. I would rather do the port when the source is restructured i.e. #6431 |
|
Sorry didn't notice I need to review this, I will take a look asap. |
colinsurprenant
force-pushed
the
feature/drain
branch
from
5ba395f to
fbb92ac
Compare
|
I rebased and would like to reboot this PR. |
ph
suggested changes
Feb 28, 2017
colinsurprenant
force-pushed
the
feature/drain
branch
from
1e05eb0 to
7cb70b3
Compare
|
@ph ok found and fixed the spec problems, some where related to empty batch handling as discussed, others related to the metrics start where my refactor had the call to |
|
Build successful! 🎉 |
wip queue drain option metrics on empty batches reenabled spec cosmetic fixes stats collection, mutex, specs, empty batch handling start_metrics
colinsurprenant
force-pushed
the
feature/drain
branch
from
9e8f961 to
568666c
Compare
|
rebased & squashed, merged into master and 5.x |
colinsurprenant
changed the title
This was referenced Mar 1, 2017
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.
This is in [WIP] state because the metrics on empty batch/queue need to be assessed - The creation of an empty final batch to handle the final flush upon shutdown which did not contain metrics yielded some errors so I added metrics to empty batches. There was originally a check for empty batches read to not start metrics but I believe this was bug because if this empty batch got used in a flush signal (slim chance) it would have crashed because of unstarted metrics for that batch.
Core tests/specs are passing locally.
This PR adds support for a queue drain option. It relates to issue #6085 and it is necessary for the upcoming BatchedQueue implementation. The goal is to be able to signal logstash to drain the queue before exiting on a normal shutdown. It is necessary for in-memory queueing support where events can be buffered.
It refactors the Wrapped xxx Queue ReadClient classes to not read the next batch directly in the constructor but instead expose a
read_batchmethod so it is now possible to create a new empty batch.The pipeline worker loop becomes a bit clearer to understand with regard to signal handling (shutdown & flush) and shutdown handling for final flush in particular.
By default this option is currently turned off and can be turned on in the config using
queue.drain: true.TODO