Merge pull request #5335 from tonistiigi/fix-log-panic

solver: fix possible panic from error handler
moby · Sep 16, 2024 · b1abc62 · b1abc62
2 parents 83bc8df + 1958ae2
commit b1abc62
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/solver/cachemanager.go b/solver/cachemanager.go
@@ -298,15 +298,20 @@ func (c *cacheManager) LoadWithParents(ctx context.Context, rec *CacheRecord) (r
 	return results, nil
 }
 
-func (c *cacheManager) Save(k *CacheKey, r Result, createdAt time.Time) (rck *ExportableCacheKey, rerr error) {
+func (c *cacheManager) Save(k *CacheKey, r Result, createdAt time.Time) (rck *ExportableCacheKey, err error) {
 	lg := bklog.G(context.TODO()).WithFields(logrus.Fields{
 		"cache_manager": c.id,
 		"op":            "save",
 		"result":        r.ID(),
 		"stack":         bklog.TraceLevelOnlyStack(),
 	})
 	defer func() {
-		lg.WithError(rerr).WithField("return_cachekey", rck.TraceFields()).Trace("cache manager")
+		if err != nil {
+			lg = lg.WithError(err)
+		} else {
+			lg = lg.WithField("return_cachekey", rck.TraceFields())
+		}
+		lg.Trace("cache manager")
 	}()
 
 	c.mu.Lock()