github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add temporary fix for issue with interrupted etcd promote 

This is a minimal fix for https://github.com/rancher/rke2/issues/392

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/2358/head
Brad Davidson 2020-09-30 03:37:45 -07:00 committed by Brad Davidson
parent 373449ec0a
commit c3c983198f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cluster/bootstrap.go
View File

@ -53,6 +53,12 @@ func (c *Cluster) shouldBootstrapLoad(ctx context.Context) (bool, error) {
// If the database is initialized we skip bootstrapping; if the user wants to rejoin a // If the database is initialized we skip bootstrapping; if the user wants to rejoin a
// cluster they need to delete the database. // cluster they need to delete the database.
logrus.Infof("Managed %s cluster bootstrap already complete and initialized", c.managedDB.EndpointName()) logrus.Infof("Managed %s cluster bootstrap already complete and initialized", c.managedDB.EndpointName())
// This is a workaround for an issue that can be caused by terminating the cluster bootstrap before
// etcd is promoted from learner. Odds are we won't need this info, and we don't want to fail startup
// due to failure to retrieve it as this will break cold cluster restart, so we ignore any errors.
if c.config.JoinURL != "" && c.config.Token != "" {
c.clientAccessInfo, _ = clientaccess.ParseAndValidateTokenForUser(c.config.JoinURL, c.config.Token, "server")
}
return false, nil return false, nil
} else if c.config.JoinURL == "" { } else if c.config.JoinURL == "" {
// Not initialized, not joining - must be initializing (cluster-init) // Not initialized, not joining - must be initializing (cluster-init)