Merge pull request #3413 from briandowns/possible_race_condition

fix possible race where bootstrap data might not save
pull/3417/head
Brian Downs 4 years ago committed by GitHub
commit bd84012061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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,15 +103,22 @@ 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 {
select {
case <-ready:
if err := c.save(ctx); err != nil { if err := c.save(ctx); err != nil {
panic(err) 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()
}
}
}() }()
} }

Loading…
Cancel
Save