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 to break infinite-loop when shutdown goes on #1396

Merged
merged 1 commit into from
Jan 5, 2017

Conversation

tagomoris
Copy link
Member

@tagomoris tagomoris commented Jan 4, 2017

Current Fluentd master:HEAD doesn't run into infinite loop with the configuration file added by this change because thread plugin helper kills all threads (including input plugin thread emitting events).

But this change fixes the problem even with plugins creating threads by plugins themselves.

@tagomoris tagomoris added bug Something isn't working v0.14 labels Jan 4, 2017
@tagomoris
Copy link
Member Author

This change relates #1260 only for v0.14.

@tagomoris
Copy link
Member Author

@repeatedly could you review this change?

# to break infinite loop to exit Fluentd process
raise
end
log.trace "sleepling until buffer can store more data"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sleeping

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops

@repeatedly
Copy link
Member

LGTM

@tagomoris tagomoris force-pushed the fix-to-exit-during-buffer-queue-is-blocking branch from 13d5e44 to d3a77e6 Compare January 4, 2017 10:15
@tagomoris tagomoris merged commit 9068e0f into master Jan 5, 2017
@tagomoris tagomoris deleted the fix-to-exit-during-buffer-queue-is-blocking branch January 5, 2017 01:37
mumoshu added a commit to mumoshu/kube-fluentd that referenced this pull request Mar 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working v0.14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants