From a0e8eebcb32faa64f3da105bf2ac38aa0fe824ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Mon, 20 Jun 2022 18:09:33 +0200
Subject: [PATCH] Manager: make access to job compilers script thread-safe

When on-disk job compiler scripts are supported, they will be reloaded
often, and it becomes more important to have the access to the map of
loaded job compilers thread-safe.
---
 internal/manager/job_compilers/job_compilers.go | 10 ++++++++++
 internal/manager/job_compilers/scripts.go       |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/internal/manager/job_compilers/job_compilers.go b/internal/manager/job_compilers/job_compilers.go
index f611ad56..510f51b3 100644
--- a/internal/manager/job_compilers/job_compilers.go
+++ b/internal/manager/job_compilers/job_compilers.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"errors"
 	"sort"
+	"sync"
 	"time"
 
 	"github.com/dop251/goja"
@@ -26,6 +27,9 @@ type Service struct {
 	compilers   map[string]Compiler // Mapping from job type name to the job compiler of that type.
 	registry    *require.Registry   // Goja module registry.
 	timeService TimeService
+
+	// mutex protects 'compilers' from race conditions.
+	mutex *sync.Mutex
 }
 
 type Compiler struct {
@@ -52,6 +56,7 @@ func Load(ts TimeService) (*Service, error) {
 	service := Service{
 		compilers:   map[string]Compiler{},
 		timeService: ts,
+		mutex:       new(sync.Mutex),
 	}
 
 	if err := service.loadScripts(); err != nil {
@@ -128,6 +133,11 @@ func (s *Service) Compile(ctx context.Context, sj api.SubmittedJob) (*AuthoredJo
 //  ListJobTypes returns the list of available job types.
 func (s *Service) ListJobTypes() api.AvailableJobTypes {
 	jobTypes := make([]api.AvailableJobType, 0)
+
+	// Protect access to s.compilers.
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+
 	for typeName := range s.compilers {
 		compiler, err := s.compilerForJobType(typeName)
 		if err != nil {
diff --git a/internal/manager/job_compilers/scripts.go b/internal/manager/job_compilers/scripts.go
index 6b43e2f3..eba75129 100644
--- a/internal/manager/job_compilers/scripts.go
+++ b/internal/manager/job_compilers/scripts.go
@@ -22,7 +22,11 @@ func (s *Service) loadScripts() error {
 		return err
 	}
 
+	// Assign the new set of compilers in a thread-safe way.
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
 	s.compilers = compilers
+
 	return nil
 }