Added max concurrent build option

Author: akclace

internal/app/container/command.go

@@ -7,13 +7,16 @@ import (
 	"bufio"
 	"bytes"
 	"container/ring"
+	"context"
 	"encoding/base32"
 	"encoding/json"
 	"fmt"
 	"io"
 	"os/exec"
 	"strconv"
 	"strings"
+	"sync"
+	"time"
 
 	"github.com/openrundev/openrun/internal/types"
 )
@@ -45,6 +48,32 @@ func genLowerCaseId(name string) string {
 	return strings.ToLower(base32encoder.EncodeToString([]byte(name)))
 }
 
+var mu sync.Mutex
+var buildLockChannel chan string // channel to hold the build ids, max size is MaxConcurrentBuilds
+
+// acquireBuildLock acquires a build lock for the given build id. If the lock is not available,
+// it will wait for the lock to be available or the context to be done.
+// The lock is released when the returned function is called.
+func acquireBuildLock(ctx context.Context, config *types.SystemConfig, buildId string) (func(), error) {
+	mu.Lock()
+	if buildLockChannel == nil {
+		buildLockChannel = make(chan string, config.MaxConcurrentBuilds)
+	}
+	mu.Unlock()
+
+	timer := time.NewTimer(time.Duration(config.MaxBuildWaitSecs) * time.Second)
+	defer timer.Stop()
+
+	select {
+	case buildLockChannel <- buildId:
+		return func() { <-buildLockChannel }, nil
+	case <-ctx.Done():
+		return nil, ctx.Err()
+	case <-timer.C:
+		return nil, context.DeadlineExceeded
+	}
+}
+
 func GenContainerName(appId types.AppId, contentHash string) ContainerName {
 	if contentHash == "" {
 		return ContainerName(fmt.Sprintf("clc-%s", appId))
@@ -76,6 +105,12 @@ func (c ContainerCommand) RemoveImage(config *types.SystemConfig, name ImageName
 }
 
 func (c ContainerCommand) BuildImage(config *types.SystemConfig, name ImageName, sourceUrl, containerFile string, containerArgs map[string]string) error {
+	releaseLock, err := acquireBuildLock(context.Background(), config, string(name))
+	if err != nil {
+		return fmt.Errorf("error acquiring build lock: %w", err)
+	}
+	defer releaseLock()
+
 	c.Debug().Msgf("Building image %s from %s with %s", name, containerFile, sourceUrl)
 	args := []string{config.ContainerCommand, "build", "-t", string(name), "-f", containerFile}
 

internal/system/config_test.go

@@ -47,6 +47,8 @@ func TestServerConfig(t *testing.T) {
 	testutil.AssertEqualsInt(t, "file debounce", 300, c.System.FileWatcherDebounceMillis)
 	testutil.AssertEqualsString(t, "node path", "", c.System.NodePath)
 	testutil.AssertEqualsString(t, "default domain", "localhost", c.System.DefaultDomain)
+	testutil.AssertEqualsInt(t, "max concurrent builds", 1, c.System.MaxConcurrentBuilds)
+	testutil.AssertEqualsInt(t, "max build wait secs", 120, c.System.MaxBuildWaitSecs)
 
 	// Global Settings
 	testutil.AssertEqualsString(t, "server uri", "$OPENRUN_HOME/run/openrun.sock", c.ServerUri)

internal/system/openrun.default.toml

@@ -71,6 +71,9 @@ http_event_retention_days = 90      # number of days to retain http events
 non_http_event_retention_days = 180 # number of days to retain non-http (system, action, custom) events
 allowed_env = ["HOME", "OPENRUN_HOME", "PATH"] # env values allowed for use in node config
 
+max_concurrent_builds = 1 # max number of concurrent container builds
+max_build_wait_secs = 120 # max wait time for a build lock
+
 [plugin."store.in"]
 db_connection = "sqlite:$OPENRUN_HOME/metadata/clace_app_store.db"
 

internal/types/types.go

@@ -223,6 +223,8 @@ type SystemConfig struct {
 	AllowedEnv                []string `toml:"allowed_env"`            // List of environment variables that are allowed to be used in the node config
 	DefaultScheduleMins       int      `toml:"default_schedule_mins"`  // Default schedule time in minutes for scheduled sync
 	MaxSyncFailureCount       int      `toml:"max_sync_failure_count"` // Max failure count for sync jobs
+	MaxConcurrentBuilds       int      `toml:"max_concurrent_builds"`  // Max concurrent container builds
+	MaxBuildWaitSecs          int      `toml:"max_build_wait_secs"`    // Max wait time for a build lock
 }
 
 // GitAuth is a github auth config entry