From 937aafd76e698830e784cf8af849eaae479a6ace Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Thu, 24 Apr 2025 17:04:38 +0200
Subject: syz-cluster: separate global env from global config

Environment variables are convenient for storing values like DB or GCS
bucket names, but structured formats are more convenient for the actual
service configuration.

Separate global-config from global-config-env and add the functionality
that queries and parses the config options.
---
 syz-cluster/controller/deployment.yaml   |  9 ++++++-
 syz-cluster/controller/main.go           |  6 ++++-
 syz-cluster/controller/processor.go      | 42 ++++++++++++--------------------
 syz-cluster/controller/processor_test.go | 12 ++++-----
 4 files changed, 35 insertions(+), 34 deletions(-)

(limited to 'syz-cluster/controller')

diff --git a/syz-cluster/controller/deployment.yaml b/syz-cluster/controller/deployment.yaml
index 5f0df411e..5272725a0 100644
--- a/syz-cluster/controller/deployment.yaml
+++ b/syz-cluster/controller/deployment.yaml
@@ -21,7 +21,10 @@ spec:
         image: ${IMAGE_PREFIX}controller:${IMAGE_TAG}
         envFrom:
           - configMapRef:
-              name: global-config
+              name: global-config-env
+        volumeMounts:
+          - name: config-volume
+            mountPath: /config
         ports:
         - containerPort: 8080
         resources:
@@ -31,3 +34,7 @@ spec:
           limits:
             cpu: 4
             memory: 16G
+      volumes:
+        - name: config-volume
+          configMap:
+            name: global-config
diff --git a/syz-cluster/controller/main.go b/syz-cluster/controller/main.go
index 525c02da0..dc6404b38 100644
--- a/syz-cluster/controller/main.go
+++ b/syz-cluster/controller/main.go
@@ -20,7 +20,11 @@ func main() {
 	if err != nil {
 		app.Fatalf("failed to set up environment: %v", err)
 	}
-	sp := NewSeriesProcessor(env)
+	cfg, err := app.Config()
+	if err != nil {
+		app.Fatalf("failed to fetch the config: %v", err)
+	}
+	sp := NewSeriesProcessor(env, cfg)
 	go func() {
 		err := sp.Loop(ctx)
 		app.Fatalf("processor loop failed: %v", err)
diff --git a/syz-cluster/controller/processor.go b/syz-cluster/controller/processor.go
index aa286a149..07851a9fa 100644
--- a/syz-cluster/controller/processor.go
+++ b/syz-cluster/controller/processor.go
@@ -8,8 +8,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"os"
-	"strconv"
 	"sync"
 	"time"
 
@@ -22,36 +20,28 @@ import (
 )
 
 type SeriesProcessor struct {
-	blobStorage     blob.Storage
-	seriesRepo      *db.SeriesRepository
-	sessionRepo     *db.SessionRepository
-	sessionTestRepo *db.SessionTestRepository
-	workflows       workflow.Service
-	dbPollInterval  time.Duration
-	parallelWorkers int
+	blobStorage       blob.Storage
+	seriesRepo        *db.SeriesRepository
+	sessionRepo       *db.SessionRepository
+	sessionTestRepo   *db.SessionTestRepository
+	workflows         workflow.Service
+	dbPollInterval    time.Duration
+	parallelWorkflows int
 }
 
-func NewSeriesProcessor(env *app.AppEnvironment) *SeriesProcessor {
+func NewSeriesProcessor(env *app.AppEnvironment, cfg *app.AppConfig) *SeriesProcessor {
 	workflows, err := workflow.NewArgoService()
 	if err != nil {
 		app.Fatalf("failed to initialize workflows: %v", err)
 	}
-	parallelWorkers := 1
-	if val := os.Getenv("PARALLEL_WORKERS"); val != "" {
-		var err error
-		parallelWorkers, err = strconv.Atoi(val)
-		if err != nil || parallelWorkers < 1 {
-			app.Fatalf("invalid PARALLEL_WORKERS value")
-		}
-	}
 	return &SeriesProcessor{
-		blobStorage:     env.BlobStorage,
-		seriesRepo:      db.NewSeriesRepository(env.Spanner),
-		sessionRepo:     db.NewSessionRepository(env.Spanner),
-		sessionTestRepo: db.NewSessionTestRepository(env.Spanner),
-		dbPollInterval:  time.Minute,
-		workflows:       workflows,
-		parallelWorkers: parallelWorkers,
+		blobStorage:       env.BlobStorage,
+		seriesRepo:        db.NewSeriesRepository(env.Spanner),
+		sessionRepo:       db.NewSessionRepository(env.Spanner),
+		sessionTestRepo:   db.NewSessionTestRepository(env.Spanner),
+		dbPollInterval:    time.Minute,
+		workflows:         workflows,
+		parallelWorkflows: cfg.ParallelWorkflows,
 	}
 }
 
@@ -113,7 +103,7 @@ func (sp *SeriesProcessor) seriesRunner(ctx context.Context, ch <-chan *db.Sessi
 	var eg errgroup.Group
 	defer eg.Wait()
 
-	eg.SetLimit(sp.parallelWorkers)
+	eg.SetLimit(sp.parallelWorkflows)
 	for {
 		var session *db.Session
 		select {
diff --git a/syz-cluster/controller/processor_test.go b/syz-cluster/controller/processor_test.go
index 9f5e04d9b..68c62ba48 100644
--- a/syz-cluster/controller/processor_test.go
+++ b/syz-cluster/controller/processor_test.go
@@ -191,11 +191,11 @@ func prepareProcessorTest(t *testing.T, workflows workflow.Service) (*SeriesProc
 	env, ctx := app.TestEnvironment(t)
 	client := controller.TestServer(t, env)
 	return &SeriesProcessor{
-		seriesRepo:      db.NewSeriesRepository(env.Spanner),
-		sessionRepo:     db.NewSessionRepository(env.Spanner),
-		sessionTestRepo: db.NewSessionTestRepository(env.Spanner),
-		workflows:       workflows,
-		dbPollInterval:  time.Second / 10,
-		parallelWorkers: 2,
+		seriesRepo:        db.NewSeriesRepository(env.Spanner),
+		sessionRepo:       db.NewSessionRepository(env.Spanner),
+		sessionTestRepo:   db.NewSessionTestRepository(env.Spanner),
+		workflows:         workflows,
+		dbPollInterval:    time.Second / 10,
+		parallelWorkflows: 2,
 	}, client, ctx
 }
-- 
cgit mrf-deployment