Merge pull request #7068 from knabben/fix-cache-error

k8s-ci-robot · web-flow · commit 8f7a213a8dc3 · 2022-08-17T05:19:04.000-07:00
🐛Using cacheCtx on WaitForCacheSync error loading
diff --git a/controllers/remote/cluster_cache_tracker.go b/controllers/remote/cluster_cache_tracker.go
@@ -266,7 +266,7 @@ func (t *ClusterCacheTracker) newClusterAccessor(ctx context.Context, cluster cl
 	// Start the cache!!!
 	go cache.Start(cacheCtx) //nolint:errcheck
 	if !cache.WaitForCacheSync(cacheCtx) {
-		return nil, fmt.Errorf("failed waiting for cache for remote cluster %v to sync: %w", cluster, err)
+		return nil, fmt.Errorf("failed waiting for cache for remote cluster %v to sync: %w", cluster, cacheCtx.Err())
 	}
 
 	// Start cluster healthcheck!!!

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ func (t *ClusterCacheTracker) newClusterAccessor(ctx context.Context, cluster cl`
`266`	`266`	`// Start the cache!!!`
`267`	`267`	`go cache.Start(cacheCtx) //nolint:errcheck`
`268`	`268`	`if !cache.WaitForCacheSync(cacheCtx) {`
`269`		`- return nil, fmt.Errorf("failed waiting for cache for remote cluster %v to sync: %w", cluster, err)`
	`269`	`+ return nil, fmt.Errorf("failed waiting for cache for remote cluster %v to sync: %w", cluster, cacheCtx.Err())`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`// Start cluster healthcheck!!!`