Fix snapshot restoration on fresh nodes #4737
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
briandowns
approved these changes
Dec 13, 2021
brandond
reviewed
Dec 13, 2021
| @@ -198,6 +198,11 @@ func (e *ETCD) Reset(ctx context.Context, rebootstrap func() error) error { | |||
| t := time.NewTicker(5 * time.Second) | |||
| defer t.Stop() | |||
| for range t.C { | |||
| // resetting the apiaddresses to nil since we are doing a restoration | |||
| if _, err := e.client.Put(ctx, AddressKey, ""); err != nil { | |||
There was a problem hiding this comment.
I was going to ask why Put empty string instead of just Delete but i see that our Put is much easier to use since it handles getting the current revision for you...
There was a problem hiding this comment.
yeah exactly :D
brandond
approved these changes
Dec 13, 2021
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
galal-hussein
force-pushed
the
fix_restoration_on_fresh_node
branch
from
51c8196
to
2a4529a
Compare
briandowns
pushed a commit
to briandowns/k3s
that referenced
this pull request
Dec 14, 2021
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com> Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
pushed a commit
to briandowns/k3s
that referenced
this pull request
Dec 14, 2021
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com> Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
pushed a commit
to briandowns/k3s
that referenced
this pull request
Dec 14, 2021
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com> Signed-off-by: Brian Downs <brian.downs@gmail.com>
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.
Proposed Changes
Types of Changes
Bugfix
Verification
Linked Issues
User-Facing Change
Further Comments