agent: when enable_central_service_config is enabled ensure agent reload doesn't revert check state to critical #8747
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
…oad doesn't revert check state to critical
rboyer
commented
Sep 24, 2020
| } | ||
|
|
||
| // addServiceLocked adds a service entry to the service manager if enabled, or directly | ||
| // to the local state if it is not. This function assumes the state lock is already held. | ||
| func (a *Agent) addServiceLocked(req *addServiceRequest, snap map[structs.CheckID]*structs.HealthCheck) error { | ||
| func (a *Agent) addServiceLocked(req *addServiceRequest) error { | ||
| req.fixupForAddServiceLocked() | ||
|
|
||
| req.service.EnterpriseMeta.Normalize() |
There was a problem hiding this comment.
Below on the line just after if a.config.EnableCentralServiceConfig { (that I can't comment on) is where req loses snap when we shunt this function call through service manager. The fix is to make sure snap is attached to req.
|
🍒✅ Cherry pick of commit 7eef25d onto |
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.
Likely introduced when #7345 landed.
The backport to 1.8.x is clean but the 1.7.x has conflicts in test code (#8748).