fix: join node creates new cluster when initial etcd sync config fails #5151
+47
−8
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
4 tasks
Signed-off-by: Ethan Mosbaugh <[email protected]>
Signed-off-by: Ethan Mosbaugh <[email protected]>
Signed-off-by: Ethan Mosbaugh <[email protected]>
emosbaugh
force-pushed
the
issue-5149-etcd-creates-new-cluster-rather-than-join-if-sync-fails
branch
from
f40047f
to
9706878
Compare
|
@jnummelin @twz123 I'm a bit stuck at this point with how to proceed with handling this case. Could you take another look at this PR and give me some guidance? Thank you! |
twz123
reviewed
Nov 8, 2024
| func (c *command) needToJoin(nodeConfig *v1beta1.ClusterConfig) bool { | ||
| if nodeConfig.Spec.Storage.Type == v1beta1.EtcdStorageType && !nodeConfig.Spec.Storage.Etcd.IsExternalClusterUsed() { | ||
| return !file.Exists(filepath.Join(c.K0sVars.EtcdDataDir, "member", "snap", "db")) |
There was a problem hiding this comment.
Might be worth adding a comment about that file, e.g. by including a link to https://etcd.io/docs/v3.5/learning/persistent-storage-files/#bbolt-btree-membersnapdb
| @@ -107,6 +107,8 @@ func (e *Etcd) syncEtcdConfig(ctx context.Context, etcdRequest v1beta1.EtcdReque | |||
| etcdResponse, err = e.JoinClient.JoinEtcd(ctx, etcdRequest) | |||
| return err | |||
| }, | |||
| retry.Delay(1*time.Second), | |||
There was a problem hiding this comment.
Can you explain why the delay was increased in the commit message, or in a comment? If I'm not mistaken this will now block for ~ 17 minutes, whereas it was blocking only around 100 secs before?
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.
Description
Fixes #5149
If etcd join fails to sync the etcd config and the k0s process exits, the pki ca files exist and etcd creates a new cluster rather than joining the existing one. Rather than check the pki dir for embedded etcd, check the etcd data directory exists as we do here.
I am open to suggestions here if I am checking the wrong thing as I cannot test this and am taking a guess at a solution.
Type of change
How Has This Been Tested?
Checklist: