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

Merge pull request #3413 from briandowns/possible_race_condition 

fix possible race where bootstrap data might not save
pull/3417/head
Brian Downs 2021-06-04 15:42:40 -07:00 committed by GitHub
parent 2554c213db afd506a595
commit bd84012061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/cluster/cluster.go
View File

@ -3,6 +3,7 @@ package cluster
import (
"context"
"net/url"
"runtime"
"strings"
"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.
if c.managedDB != nil {
go func() {
for range ready {
if err := c.save(ctx); err != nil {
panic(err)
}
}
for {
select {
case <-ready:
if err := c.save(ctx); err != nil {
panic(err)
}
if err := c.managedDB.StoreSnapshotData(ctx); err != nil {
logrus.Errorf("Failed to record snapshots for cluster: %v", err)
if err := c.managedDB.StoreSnapshotData(ctx); err != nil {
logrus.Errorf("Failed to record snapshots for cluster: %v", err)
}
return
default:
runtime.Gosched()
}
}
}()
}