From 6eea27042142c1c5e810b642deb831a8ed55b3da Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Thu, 23 Jan 2025 19:07:33 +0100
Subject: pkg/manager: avoid log.Fatalf in manager.LoadSeeds

This enables graceful error handling in the caller code.
---
 pkg/manager/diff.go | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'pkg/manager/diff.go')

diff --git a/pkg/manager/diff.go b/pkg/manager/diff.go
index a96d4f9a8..17d056e1f 100644
--- a/pkg/manager/diff.go
+++ b/pkg/manager/diff.go
@@ -45,9 +45,15 @@ func RunDiffFuzzer(ctx context.Context, baseCfg, newCfg *mgrconfig.Config, debug
 	if err != nil {
 		return err
 	}
-	go func() {
-		new.candidates <- LoadSeeds(newCfg, true).Candidates
-	}()
+	eg, ctx := errgroup.WithContext(ctx)
+	eg.Go(func() error {
+		info, err := LoadSeeds(newCfg, true)
+		if err != nil {
+			return err
+		}
+		new.candidates <- info.Candidates
+		return nil
+	})
 
 	stream := queue.NewRandomQueue(4096, rand.New(rand.NewSource(time.Now().UnixNano())))
 	base.source = stream
@@ -73,8 +79,10 @@ func RunDiffFuzzer(ctx context.Context, baseCfg, newCfg *mgrconfig.Config, debug
 		}
 		new.http = diffCtx.http
 	}
-	diffCtx.Loop(ctx)
-	return nil
+	eg.Go(func() error {
+		return diffCtx.Loop(ctx)
+	})
+	return eg.Wait()
 }
 
 type diffContext struct {
@@ -343,7 +351,15 @@ func (kc *kernelContext) setupFuzzer(features flatrpc.Feature, syscalls map[*pro
 		kc.http.Corpus.Store(corpusObj)
 	}
 
-	filtered := FilterCandidates(<-kc.candidates, syscalls, false).Candidates
+	var candidates []fuzzer.Candidate
+	select {
+	case candidates = <-kc.candidates:
+	case <-kc.ctx.Done():
+		// The loop will be aborted later.
+		break
+	}
+
+	filtered := FilterCandidates(candidates, syscalls, false).Candidates
 	log.Logf(0, "%s: adding %d seeds", kc.name, len(filtered))
 	fuzzerObj.AddCandidates(filtered)
 
-- 
cgit mrf-deployment