Sentinel: return an error if configuration save fails#10151
Merged
Conversation
moticless
reviewed
Jan 20, 2022
moticless
approved these changes
Jan 26, 2022
moticless
left a comment
Collaborator
There was a problem hiding this comment.
Looks good. Thank you.
Member
|
@hwware @moticless please put some description in the top comment. |
Contributor
Author
@oranagra The description for this PR is added in the top, please take a look, Thanks |
If SENTINEL SET fails input validation *and* fails to flush other changes, we need to choose as we can't produce two errors. For now, keep reporting the user error - but ultimately this should probably be atomic. Other minor changes: * Shorten error message * Use a helper function to avoid repeating the check/error reply.
Collaborator
|
@moticless @hwware Added a commit to fix an issue + a small cleanup, PTAL. Thanks! |
moticless
approved these changes
Feb 3, 2022
yossigo
approved these changes
Feb 3, 2022
Contributor
|
The test failed, I think a way to pass in Centos, is i am running a daily and see how it (dir things) will look like (passed): https://github.com/enjoy-binbin/redis/actions/runs/1793640021 |
enjoy-binbin
added a commit
to enjoy-binbin/redis
that referenced
this pull request
Feb 4, 2022
Change the sentinel config file to a directory in SENTINEL SET test. So it will now fail on the `rename` in `rewriteConfigOverwriteFile`. The test used to set the sentinel config file permissions to `000` to simulate failure. But it fails on centos7 / freebsd / alpine. (introduced in redis#10151) Other changes: 1. More error messages after the config rewrite failure. 2. Modify arg name `force_all` in `rewriteConfig` to `force_write`. (was rename in redis#9304) 3. Fix a typo in debug quicklist-packed-threshold, then -> than. (redis#9357)
oranagra
pushed a commit
that referenced
this pull request
Feb 4, 2022
Change the sentinel config file to a directory in SENTINEL SET test. So it will now fail on the `rename` in `rewriteConfigOverwriteFile`. The test used to set the sentinel config file permissions to `000` to simulate failure. But it fails on centos7 / freebsd / alpine. (introduced in #10151) Other changes: 1. More error messages after the config rewrite failure. 2. Modify arg name `force_all` in `rewriteConfig` to `force_write`. (was rename in #9304) 3. Fix a typo in debug quicklist-packed-threshold, then -> than. (#9357)
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
When performing
SENTINEL SET, Sentinel updates the local configuration file. Before this commit, failure to update the file would still result with an+OKreply. Now, a-ERR Failed to save config fileerror will be returned.