Merge pull request #3510 from briandowns/backport_issue-3414_release_1.21

[Backport 1.21] - fix possible race where bootstrap data might not save
This commit is contained in:
Brian Downs 2021-06-25 14:43:24 -07:00 committed by GitHub
commit 34d767d40e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,6 +3,7 @@ package cluster
import ( import (
"context" "context"
"net/url" "net/url"
"runtime"
"strings" "strings"
"github.com/k3s-io/kine/pkg/endpoint" "github.com/k3s-io/kine/pkg/endpoint"
@ -102,14 +103,21 @@ func (c *Cluster) Start(ctx context.Context) (<-chan struct{}, error) {
// snapshots will be empty. // snapshots will be empty.
if c.managedDB != nil { if c.managedDB != nil {
go func() { go func() {
for range ready { for {
if err := c.save(ctx); err != nil { select {
panic(err) case <-ready:
} if err := c.save(ctx); err != nil {
} panic(err)
}
if err := c.managedDB.StoreSnapshotData(ctx); err != nil { if err := c.managedDB.StoreSnapshotData(ctx); err != nil {
logrus.Errorf("Failed to record snapshots for cluster: %v", err) logrus.Errorf("Failed to record snapshots for cluster: %v", err)
}
return
default:
runtime.Gosched()
}
} }
}() }()
} }