(DIO-2675) Undo pool size & template overrides #461
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
genebean
force-pushed
the
dio2675
branch
4 times, most recently
from
6bf0c8a to
4d90d46
Compare
|
The initial method I used to accomplish this would clean up things in redis but would not update the running config properly. I move the PR back to draft and am reworking some aspects of it. |
genebean
force-pushed
the
dio2675
branch
5 times, most recently
from
fb05341 to
069c12d
Compare
genebean
changed the title
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
sbeaulie
reviewed
Oct 28, 2021
|
@sbeaulie I think this is ready for another review. |
sbeaulie
reviewed
Nov 3, 2021
| it 'the copy is a separate object and not a reference' do | ||
| Dir.chdir(fixtures_dir) do | ||
| configuration = Vmpooler.config | ||
| configuration[:pools][0]['template'] = 'sam' |
sbeaulie
reviewed
Nov 3, 2021
| # rubocop:disable Security/MarshalLoad | ||
|
|
||
| # retain a copy of the pools that were observed at startup | ||
| serialized_pools = Marshal.dump(parsed_config[:pools]) |
There was a problem hiding this comment.
could do one liner here
Suggested change
| serialized_pools = Marshal.dump(parsed_config[:pools]) | |
| parsed_config[:pools_at_startup] = Marshal.load(Marshal.dump(parsed_config[:pools])) |
There was a problem hiding this comment.
It think the one liner is a little hard to follow, personally
mattkirby
reviewed
Nov 4, 2021
mattkirby
reviewed
Nov 4, 2021
mattkirby
approved these changes
Nov 4, 2021
This makes it so that cached layers can be used when all that is changing is VMPooler's code, and not its gems.
This implements a delete method for pooltemplate and poolsize. The API removes the override from Redis and then adds an entry in Redis that causes the pool manager to wake up and process the removal of the override. To facilitate this, a new variable has been created in lib/vmpooler.rb to hold a copy of the original / pre-override config. This supplemental copy of the pools is then indexed for use as a reference. When pool manager wakes up to process an override removal, it looks up the pre-override value from the config via the new variables mentioned above. Just as with entering overrides, no restart is needed. Template and pool size changes are logged so that anyone watching or reviewing the logs can see what happened when. The new API endpoints also return values for both the pre-revert and post-revert value.
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 implements a delete method for pooltemplate and poolsize. The API removes the override from Redis and then adds an entry in Redis that causes the pool manager to wake up and process the removal of the override.
To facilitate this, a new variable has been created in lib/vmpooler.rb to hold a copy of the original / pre-override config. This supplemental copy of the pools is then indexed for use as a reference.
When pool manager wakes up to process an override removal, it looks up the pre-override value from the config via the new variables mentioned above.
Just as with entering overrides, no restart is needed. Template and pool size changes are logged so that anyone watching or reviewing the logs can see what happened when. The new API endpoints also return values for both the pre-revert and post-revert value.
There is a second commit that also makes it so that Dockerfile_local can use cached layers when all that is changing is VMPooler's code, and not its gems.