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

pkg/cluster/cluster.go

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