Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve restore bootstrap #4704

Merged
merged 5 commits into from
Dec 9, 2021

Conversation

briandowns
Copy link
Contributor

@briandowns briandowns commented Dec 9, 2021

Proposed Changes

Types of Changes

Verification

Scenario 1

  1. Start cluster
  2. Take a snapshot
  3. Restore the snapshot
  4. Restart cluster

Scenario 2

  1. Start cluster
  2. Take a snaphsot
  3. Stop the cluster
  4. Restore to a new node

Scenario 3

  1. Start a cluster
  2. Take a snapshot
  3. Stop the cluster
  4. Remove data directory
  5. Restore the snapshot
  6. Start the server
  7. Add node(s)

Linked Issues

#4703

User-Facing Change

Resolve issue preventing successful restore of etcd snapshot due to change in bootstrapping logic.

Further Comments

Signed-off-by: Brian Downs <brian.downs@gmail.com>
Signed-off-by: Brian Downs <brian.downs@gmail.com>
@briandowns briandowns requested a review from a team December 9, 2021 15:31
@briandowns briandowns self-assigned this Dec 9, 2021
Signed-off-by: Brian Downs <brian.downs@gmail.com>
@briandowns briandowns closed this Dec 9, 2021
Signed-off-by: Brian Downs <brian.downs@gmail.com>
@briandowns briandowns reopened this Dec 9, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #4704 (f8372a6) into master (e8a30a8) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4704      +/-   ##
==========================================
- Coverage   10.58%   10.56%   -0.03%     
==========================================
  Files         142      142              
  Lines       10193    10216      +23     
==========================================
  Hits         1079     1079              
- Misses       8886     8909      +23     
  Partials      228      228              
Flag Coverage Δ
unittests 10.56% <0.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/bootstrap/bootstrap.go 19.04% <0.00%> (-0.96%) ⬇️
pkg/cluster/bootstrap.go 0.00% <0.00%> (ø)
pkg/etcd/etcd.go 14.54% <0.00%> (-0.02%) ⬇️
pkg/cli/cert/cert.go 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e8a30a8...f8372a6. Read the comment docs.

Copy link
Contributor

@brandond brandond left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a couple nits on logging what it's doing, but looks good otherwise

pkg/cluster/bootstrap.go Outdated Show resolved Hide resolved
pkg/cluster/bootstrap.go Outdated Show resolved Hide resolved
Signed-off-by: Brian Downs <brian.downs@gmail.com>
@briandowns briandowns merged commit a6fe2c0 into k3s-io:master Dec 9, 2021
briandowns added a commit to briandowns/k3s that referenced this pull request Dec 9, 2021
Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns added a commit to briandowns/k3s that referenced this pull request Dec 9, 2021
Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns added a commit to briandowns/k3s that referenced this pull request Dec 9, 2021
Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns added a commit to briandowns/k3s that referenced this pull request Dec 9, 2021
Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns added a commit that referenced this pull request Dec 10, 2021
briandowns added a commit that referenced this pull request Dec 10, 2021
briandowns added a commit that referenced this pull request Dec 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants