Add rate limiter and update tests. #10987
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
howbazaar
force-pushed
the
2.7-apiserver-agent-ratelimiting
branch
from
a5ad4d9
to
62b195c
Compare
howbazaar
force-pushed
the
2.7-apiserver-agent-ratelimiting
branch
from
62b195c
to
6b63be1
Compare
|
I need to update this to support disabling the ratelimiting. |
|
LGTM. Works well, tested the rate limiting on microk8s with ~50 agents. |
hpidcock
approved these changes
Dec 5, 2019
jameinel
approved these changes
Dec 5, 2019
| @@ -29,29 +29,31 @@ func (s *ControllerSuite) TestControllerAndModelConfigInitialisation(c *gc.C) { | |||
| c.Assert(err, jc.ErrorIsNil) | |||
|
|
|||
| optional := set.NewStrings( | |||
| controller.IdentityURL, | |||
| controller.IdentityPublicKey, | |||
| controller.AgentRateLimitMax, | |||
There was a problem hiding this comment.
I assume this is just Sort() the list alphabetically
There was a problem hiding this comment.
Yeah, I hit my OCD limit
| srv.updateAgentRateLimiter(data.Config) | ||
| }) | ||
| if err != nil { | ||
| logger.Criticalf("programming error in subscribe function: %v", err) |
There was a problem hiding this comment.
This one is critical by design.
hpidcock
reviewed
Dec 5, 2019
| @@ -534,6 +534,8 @@ func (s *JujuConnSuite) setUpConn(c *gc.C) { | |||
| for key, value := range s.ControllerConfigAttrs { | |||
| s.ControllerConfig[key] = value | |||
| } | |||
| // Explicitly disable rate limiting. | |||
| s.ControllerConfig[controller.AgentRateLimitMax] = 0 | |||
|
|
|
|
1 similar comment
|
|
jujubot
added a commit
that referenced
this pull request
Dec 10, 2019
#11001 Merge 2.7 forward for: - #10996 from wallyworld/lookup-action-prefix - #10995 from anastasiamac/missing-cons-lp1854510 - #10968 from anastasiamac/add-cred-UR-force - #10987 from howbazaar/2.7-apiserver-agent-ratelimiting - #10992 from howbazaar/2.7-test-races - #10933 from jameinel/2.7-delay-done - #10966 from jameinel/2.7-handle-start-error-1854338
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.
Add configurable rate limiting for agent connections.
This work took a sideways step as I needed to write tests for the rate limiting, but all the login tests were using JujuConnSuite. So I changed the login tests to instead be based on statetetesting.StateSuite, which is much lighter.
QA steps
Documentation changes
Will need to document the two new controller config values.