Merge "Need to catch the errors when closing and flushing." into main am: b83d6420e2

Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/3101377

Change-Id: I050e06ce732a180ff67ae8a4dbb8d33f4a07c21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bootstrap/command.go

@@ -28,6 +28,7 @@ import (
 	"strings"
 
 	"github.com/google/blueprint"
+	"github.com/google/blueprint/proptools"
 )
 
 type Args struct {
@@ -190,14 +191,7 @@ func RunBlueprint(args Args, stopBefore StopBefore, ctx *blueprint.Context, conf
 
 	providerValidationErrors := <-providersValidationChan
 	if providerValidationErrors != nil {
-		var sb strings.Builder
-		for i, err := range providerValidationErrors {
-			if i != 0 {
-				sb.WriteString("\n")
-			}
-			sb.WriteString(err.Error())
-		}
-		return nil, errors.New(sb.String())
+		return nil, proptools.MergeErrors(providerValidationErrors)
 	}
 
 	if args.Memprofile != "" {

context.go

@@ -38,7 +38,6 @@ import (
 	"sync/atomic"
 	"text/scanner"
 	"text/template"
-	"time"
 	"unsafe"
 
 	"github.com/google/blueprint/metrics"
@@ -4536,42 +4535,52 @@ func (c *Context) writeAllModuleActions(nw *ninjaWriter, shardNinja bool, ninjaF
 	}
 
 	if shardNinja {
+		var wg sync.WaitGroup
 		errorCh := make(chan error)
-		fileNames := GetNinjaShardFiles(ninjaFileName)
-		shardedModules := proptools.ShardByCount(modules, len(fileNames))
-		ninjaShardCnt := len(shardedModules)
+		files := GetNinjaShardFiles(ninjaFileName)
+		shardedModules := proptools.ShardByCount(modules, len(files))
 		for i, batchModules := range shardedModules {
-			go func(i int, batchModules []*moduleInfo) {
-				f, err := os.OpenFile(filepath.Join(c.SrcDir(), fileNames[i]), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, OutFilePermissions)
+			file := files[i]
+			wg.Add(1)
+			go func(file string, batchModules []*moduleInfo) {
+				defer wg.Done()
+				f, err := os.OpenFile(filepath.Join(c.SrcDir(), file), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, OutFilePermissions)
 				if err != nil {
 					errorCh <- fmt.Errorf("error opening Ninja file: %s", err)
 					return
 				}
-				defer f.Close()
-				buf := bufio.NewWriterSize(f, 16*1024*1024)
-				defer buf.Flush()
-				writer := newNinjaWriter(buf)
-				errorCh <- c.writeModuleAction(batchModules, writer, headerTemplate)
-			}(i, batchModules)
-			nw.Subninja(fileNames[i])
-		}
-
-		if ninjaShardCnt > 0 {
-			afterCh := time.After(60 * time.Second)
-			count := 1
-			for {
-				select {
-				case err := <-errorCh:
+				defer func() {
+					err := f.Close()
 					if err != nil {
-						return err
-					} else if count == ninjaShardCnt {
-						return nil
+						errorCh <- err
 					}
-					count++
-				case <-afterCh:
-					return fmt.Errorf("timed out when writing ninja file")
+				}()
+				buf := bufio.NewWriterSize(f, 16*1024*1024)
+				defer func() {
+					err := buf.Flush()
+					if err != nil {
+						errorCh <- err
 					}
+				}()
+				writer := newNinjaWriter(buf)
+				err = c.writeModuleAction(batchModules, writer, headerTemplate)
+				if err != nil {
+					errorCh <- err
 				}
+			}(file, batchModules)
+			nw.Subninja(file)
+		}
+		go func() {
+			wg.Wait()
+			close(errorCh)
+		}()
+
+		var errors []error
+		for newErrors := range errorCh {
+			errors = append(errors, newErrors)
+		}
+		if len(errors) > 0 {
+			return proptools.MergeErrors(errors)
 		}
 		return nil
 	} else {

proptools/utils.go

@@ -1,7 +1,9 @@
 package proptools
 
 import (
+	"errors"
 	"math"
+	"strings"
 )
 
 func ShardBySize[T ~[]E, E any](toShard T, shardSize int) []T {
@@ -23,3 +25,18 @@ func ShardBySize[T ~[]E, E any](toShard T, shardSize int) []T {
 func ShardByCount[T ~[]E, E any](toShard T, shardCount int) []T {
 	return ShardBySize(toShard, int(math.Ceil(float64(len(toShard))/float64(shardCount))))
 }
+
+// MergeErrors merges a list of errors into a single error.
+func MergeErrors(errs []error) error {
+	if errs != nil {
+		var sb strings.Builder
+		for i, err := range errs {
+			if i != 0 {
+				sb.WriteString("\n")
+			}
+			sb.WriteString(err.Error())
+		}
+		return errors.New(sb.String())
+	}
+	return nil
+}