fix: prevent OOM on rapid schema publishing
schemas / vulnerabilities (pull_request) Successful in 6m43s
schemas / check-release (pull_request) Successful in 11m27s
schemas / check (pull_request) Successful in 14m51s
pre-commit / pre-commit (pull_request) Successful in 19m39s
schemas / build (pull_request) Successful in 8m26s
schemas / deploy-prod (pull_request) Has been skipped
schemas / vulnerabilities (pull_request) Successful in 6m43s
schemas / check-release (pull_request) Successful in 11m27s
schemas / check (pull_request) Successful in 14m51s
pre-commit / pre-commit (pull_request) Successful in 19m39s
schemas / build (pull_request) Successful in 8m26s
schemas / deploy-prod (pull_request) Has been skipped
Add concurrency-limited CosmoGenerator (semaphore limit=1, 60s timeout) to prevent unbounded concurrent wgc process spawning. Add debouncer (500ms) to coalesce rapid schema updates per org+ref. Fix double subgraph fetch in Supergraph resolver and goroutine leak in SchemaUpdates subscription. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,11 +1,14 @@
|
||||
package graph
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"golang.org/x/sync/semaphore"
|
||||
"gopkg.in/yaml.v3"
|
||||
|
||||
"gitea.unbound.se/unboundsoftware/schemas/graph/model"
|
||||
@@ -123,3 +126,36 @@ func GenerateCosmoRouterConfigWithExecutor(subGraphs []*model.SubGraph, executor
|
||||
|
||||
return string(configJSON), nil
|
||||
}
|
||||
|
||||
// CosmoGenerator wraps config generation with a concurrency limit and timeout
|
||||
// to prevent unbounded wgc process spawning under rapid schema updates.
|
||||
type CosmoGenerator struct {
|
||||
sem *semaphore.Weighted
|
||||
executor CommandExecutor
|
||||
timeout time.Duration
|
||||
}
|
||||
|
||||
// NewCosmoGenerator creates a CosmoGenerator that allows at most one concurrent
|
||||
// wgc process and applies the given timeout to each generation attempt.
|
||||
func NewCosmoGenerator(executor CommandExecutor, timeout time.Duration) *CosmoGenerator {
|
||||
return &CosmoGenerator{
|
||||
sem: semaphore.NewWeighted(1),
|
||||
executor: executor,
|
||||
timeout: timeout,
|
||||
}
|
||||
}
|
||||
|
||||
// Generate produces a Cosmo Router config, blocking if another generation is
|
||||
// already in progress. The provided context (plus the configured timeout)
|
||||
// controls cancellation.
|
||||
func (g *CosmoGenerator) Generate(ctx context.Context, subGraphs []*model.SubGraph) (string, error) {
|
||||
ctx, cancel := context.WithTimeout(ctx, g.timeout)
|
||||
defer cancel()
|
||||
|
||||
if err := g.sem.Acquire(ctx, 1); err != nil {
|
||||
return "", fmt.Errorf("acquire cosmo generator: %w", err)
|
||||
}
|
||||
defer g.sem.Release(1)
|
||||
|
||||
return GenerateCosmoRouterConfigWithExecutor(subGraphs, g.executor)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user