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.

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

Fix race in filebeat shutdown with timeouts #4666

Merged
merged 3 commits into from Jul 14, 2017

Conversation

Projects
None yet
4 participants
@urso
Copy link
Collaborator

commented Jul 13, 2017

  • Fix race on filebeat shutdown in the ack handler quitting early.
  • add metrics
    filebeat.events.active: active events in filebeat (harvester -> registry)
    filebeat.events.added: number of events published by harvesters
    filebeat.events.done: number of events finalised by registry

urso added some commits Jul 13, 2017

Add filebeat.events metrics
count number of total events and active events (generated by harvester ->
registry update)
@exekias
Copy link
Member

left a comment

LGTM

@@ -252,7 +252,7 @@ func (b *Broker) reportACK(states []clientState, start, N int) {
if count == 0 || count > math.MaxUint32/2 {
// seq number comparison did underflow. This happens only if st.seq has
// allready been acknowledged
b.logger.Debug("seq number already acked: ", st.seq)
// b.logger.Debug("seq number already acked: ", st.seq)

This comment has been minimized.

Copy link
@ruflin

ruflin Jul 14, 2017

Collaborator

Commented out on purpose?

@ruflin ruflin merged commit 95e6fa2 into elastic:master Jul 14, 2017

3 of 4 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
CLA Commit author is a member of Elasticsearch
Details
beats-ci Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ruflin

This comment has been minimized.

Copy link
Collaborator

commented Jul 14, 2017

@urso Merged this one. There is a failing test in appveyor for harvester_limit. Did you already look into this?

@urso urso deleted the urso:fix/shutdown-race branch Jul 19, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.