history: fix logs and traces are saving on canceled builds

Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit 9e325b9)

solver/llbsolver/solver.go

@@ -177,6 +177,9 @@ func (s *Solver) recordBuildHistory(ctx context.Context, id string, req frontend
 			}
 		}
 
+		ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
+		defer cancel()
+
 		var mu sync.Mutex
 		ch := make(chan *client.SolveStatus)
 		eg, ctx2 := errgroup.WithContext(ctx)
@@ -334,10 +337,6 @@ func (s *Solver) recordBuildHistory(ctx context.Context, id string, req frontend
 			}
 		}
 
-		if err != nil {
-			return err
-		}
-
 		if stopTrace == nil {
 			logrus.Warn("no trace recorder found, skipping")
 			return err