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

Throttle LB status if journal utilization is too high #2312

Merged
merged 1 commit into from Jun 7, 2016

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented May 31, 2016

This change set adds the load balancer status "THROTTLED", represented by HTTP status 429 (Too many requests).

The load balancer status will be changed to THROTTLED (HTTP 429) if the journal utilization exceeds a configured threshold, see lb_throttle_threshold_percentage setting, and will be changed to ALIVE (HTTP 200) if the utilization is lower again.

Originally written by Mikko Lehtisalo (https://github.com/mikkolehtisalo)

Closes #1100
Refs #1952

@joschi
Copy link
Contributor Author

@joschi joschi commented May 31, 2016

See #1952 for previous discussion.

@dennisoelkers
Copy link
Member

@dennisoelkers dennisoelkers commented Jun 7, 2016

Could you please rebase it? I will review it afterwards.

This change set adds the load balancer status "THROTTLED", represented by HTTP status 429 (Too many requests).

The load balancer status will be changed to THROTTLED (HTTP 429) if the journal utilization exceeds a configured
threshold, see `lb_throttle_threshold_percentage` setting, and will be changed to ALIVE (HTTP 200) if the utilization
is lower again.

Originally written by Mikko Lehtisalo (https://github.com/mikkolehtisalo)

Closes #1100
Refs #1952
@joschi joschi force-pushed the pr-1952-journal-throttling branch from b3022e4 to a886bd1 Jun 7, 2016
@joschi
Copy link
Contributor Author

@joschi joschi commented Jun 7, 2016

@dennisoelkers
Copy link
Member

@dennisoelkers dennisoelkers commented Jun 7, 2016

LGTM 👍

@dennisoelkers dennisoelkers merged commit 83fabe8 into master Jun 7, 2016
4 checks passed
4 checks passed
@garybot2
ci-server-integration Jenkins build graylog2-server-integration-pr 972 has succeeded
Details
@garybot2
ci-web-linter Jenkins build graylog-pr-linter-check 458 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@dennisoelkers dennisoelkers deleted the pr-1952-journal-throttling branch Jun 7, 2016
joschi added a commit that referenced this pull request Jul 18, 2016
bernd added a commit that referenced this pull request Jul 19, 2016
* Move config bindings into own Guice module
* Add missing Guice modules to AbstractJournalCommand

Refs #2312
Fixes #2493
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants