update bootstrap logic #4438
Merged
update bootstrap logic #4438
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
Codecov Report
@@ Coverage Diff @@
## master #4438 +/- ##
==========================================
- Coverage 11.62% 11.55% -0.07%
==========================================
Files 135 135
Lines 9343 9425 +82
==========================================
+ Hits 1086 1089 +3
- Misses 8023 8103 +80
+ Partials 234 233 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
dereknola
approved these changes
Nov 9, 2021
brandond
reviewed
Nov 9, 2021
brandond
reviewed
Nov 9, 2021
brandond
approved these changes
Nov 9, 2021
Signed-off-by: Brian Downs <brian.downs@gmail.com>
Signed-off-by: Brian Downs <brian.downs@gmail.com>
Signed-off-by: Brian Downs <brian.downs@gmail.com>
Signed-off-by: Brian Downs <brian.downs@gmail.com>
Signed-off-by: Brian Downs <brian.downs@gmail.com>
Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
force-pushed
the
issue-4335
branch
from
9ad8232 to
e7cb869
Compare
Signed-off-by: Brian Downs <brian.downs@gmail.com>
brandond
approved these changes
Nov 10, 2021
briandowns
added a commit
to briandowns/k3s
that referenced
this pull request
Nov 10, 2021
* update bootstrap logic resolving a startup bug and account for etcd Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
added a commit
to briandowns/k3s
that referenced
this pull request
Nov 10, 2021
* update bootstrap logic resolving a startup bug and account for etcd Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
added a commit
to briandowns/k3s
that referenced
this pull request
Nov 10, 2021
* update bootstrap logic resolving a startup bug and account for etcd Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
added a commit
to briandowns/k3s
that referenced
this pull request
Nov 10, 2021
* update bootstrap logic resolving a startup bug and account for etcd Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
added a commit
to briandowns/k3s
that referenced
this pull request
Nov 10, 2021
* update bootstrap logic resolving a startup bug and account for etcd Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
added a commit
to briandowns/k3s
that referenced
this pull request
Nov 10, 2021
* update bootstrap logic resolving a startup bug and account for etcd Signed-off-by: Brian Downs <brian.downs@gmail.com>
briandowns
added a commit
to briandowns/k3s
that referenced
this pull request
Nov 10, 2021
* update bootstrap logic resolving a startup bug and account for etcd Signed-off-by: Brian Downs <brian.downs@gmail.com>
1 task
brandond
added a commit
to brandond/k3s
that referenced
this pull request
Jul 7, 2022
Since k3s-io#4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/k3s
that referenced
this pull request
Jul 7, 2022
Since k3s-io#4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/k3s
that referenced
this pull request
Jul 8, 2022
Since k3s-io#4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/k3s
that referenced
this pull request
Jul 8, 2022
Since k3s-io#4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
to brandond/k3s
that referenced
this pull request
Jul 8, 2022
Since k3s-io#4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This was referenced Jul 8, 2022
brandond
added a commit
that referenced
this pull request
Jul 12, 2022
Since #4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
that referenced
this pull request
Jul 12, 2022
Since #4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
added a commit
that referenced
this pull request
Jul 12, 2022
Since #4438 removed 2-way sync and treats any changed+newer files on disk as an error, we no longer need to determine if files are newer on disk/db or if there is a conflicting mix of both. Any changed+newer file is an error, unless we're doing a cluster reset in which case everything is unconditionally replaced. Signed-off-by: Brad Davidson <brad.davidson@rancher.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.
Signed-off-by: Brian Downs brian.downs@gmail.com
Proposed Changes
Types of Changes
Resolves issue #4335 as well as changes the expected behavior from a 2 way synchronization of data between disk and database to a 1 way with the database being authoritative and disk changes resulting in a processing halt.
Verification
Scenario 2
Same steps for verifying #4335
Scenario 2
Start server 1.
Stop server 1.
Change the contents of a file in the bootstrap data: client-ca.crt for example.
Start server 1.
Observe a failure indicating that the file has been changed and a suggestion for it to be removed to be subsequently recovered.
A handy means of verifying that the same data exists on any node:
Linked Issues
#4335
User-Facing Change
Further Comments