From fb9cd3cbf56a2374fca7c1503d885a610d5e0743 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 10 Mar 2020 22:33:29 -0700 Subject: [PATCH 1/3] block on preload download --- pkg/minikube/node/cache.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go index fa56bda265..12a37cb6d1 100644 --- a/pkg/minikube/node/cache.go +++ b/pkg/minikube/node/cache.go @@ -42,6 +42,7 @@ func beginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVe glog.Info("Caching tarball of preloaded images") return download.Preload(k8sVersion, cRuntime) }) + g.Wait() return } From 94dfb49ae905456374b11395e45541299388b310 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 10 Mar 2020 22:45:53 -0700 Subject: [PATCH 2/3] check for err --- pkg/minikube/node/cache.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go index 12a37cb6d1..de9ec6d204 100644 --- a/pkg/minikube/node/cache.go +++ b/pkg/minikube/node/cache.go @@ -42,8 +42,12 @@ func beginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVe glog.Info("Caching tarball of preloaded images") return download.Preload(k8sVersion, cRuntime) }) - g.Wait() - return + err := g.Wait() + if err == nil { + glog.Infof("Finished downloading the preloaded tar for %s on %s", k8sVersion, cRuntime) + return // don't cache individual images if preload is successful. + } + glog.Errorf("Error downloading preloaded artifacts will continue without preload: %v", err) } if !viper.GetBool("cache-images") { From f92edc308755f41b6def62ede901299fede20bf1 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 11 Mar 2020 09:06:32 -0700 Subject: [PATCH 3/3] preload dont use gwait --- pkg/minikube/node/cache.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/node/cache.go b/pkg/minikube/node/cache.go index de9ec6d204..293424fb8d 100644 --- a/pkg/minikube/node/cache.go +++ b/pkg/minikube/node/cache.go @@ -38,16 +38,13 @@ import ( // beginCacheKubernetesImages caches images required for kubernetes version in the background func beginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVersion, cRuntime string) { if download.PreloadExists(k8sVersion, cRuntime) { - g.Go(func() error { - glog.Info("Caching tarball of preloaded images") - return download.Preload(k8sVersion, cRuntime) - }) - err := g.Wait() + glog.Info("Caching tarball of preloaded images") + err := download.Preload(k8sVersion, cRuntime) if err == nil { glog.Infof("Finished downloading the preloaded tar for %s on %s", k8sVersion, cRuntime) return // don't cache individual images if preload is successful. } - glog.Errorf("Error downloading preloaded artifacts will continue without preload: %v", err) + glog.Warningf("Error downloading preloaded artifacts will continue without preload: %v", err) } if !viper.GetBool("cache-images") {