Skip to content

fix: orchestrator/template manager shutdown exit code #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: orchestrator/template manager shutdown exit code #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
042b3aa
fix template manager shutdown exit code
dobrac Oct 18, 2025
62b17cb
fix EINVAL error handling for logger sync
dobrac Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions packages/client-proxy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@

"github.com/e2b-dev/infra/packages/proxy/internal/cfg"
"github.com/e2b-dev/infra/packages/proxy/internal/edge"
"github.com/e2b-dev/infra/packages/proxy/internal/edge-pass-through"
edgepassthrough "github.com/e2b-dev/infra/packages/proxy/internal/edge-pass-through"
"github.com/e2b-dev/infra/packages/proxy/internal/edge/authorization"
e2binfo "github.com/e2b-dev/infra/packages/proxy/internal/edge/info"
e2borchestrators "github.com/e2b-dev/infra/packages/proxy/internal/edge/pool"
e2bproxy "github.com/e2b-dev/infra/packages/proxy/internal/proxy"
servicediscovery "github.com/e2b-dev/infra/packages/proxy/internal/service-discovery"
"github.com/e2b-dev/infra/packages/shared/pkg/env"
"github.com/e2b-dev/infra/packages/shared/pkg/http/edge"
api "github.com/e2b-dev/infra/packages/shared/pkg/http/edge"
"github.com/e2b-dev/infra/packages/shared/pkg/logger"

Check failure on line 34 in packages/client-proxy/main.go

View workflow job for this annotation

GitHub Actions / lint / golangci-lint (/home/runner/work/infra/infra/packages/client-proxy) 

ST1019: package "github.com/e2b-dev/infra/packages/shared/pkg/logger" is being imported more than once (staticcheck)
e2blogger "github.com/e2b-dev/infra/packages/shared/pkg/logger"

Check failure on line 35 in packages/client-proxy/main.go

View workflow job for this annotation

GitHub Actions / lint / golangci-lint (/home/runner/work/infra/infra/packages/client-proxy) 

duplicated-imports: Package "github.com/e2b-dev/infra/packages/shared/pkg/logger" already imported (revive)
e2bcatalog "github.com/e2b-dev/infra/packages/shared/pkg/sandbox-catalog"
"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
)
Expand Down Expand Up @@ -75,7 +76,7 @@
}
}()

logger := zap.Must(
l := zap.Must(
e2blogger.NewLogger(
ctx, e2blogger.LoggerConfig{
ServiceName: serviceName,
Expand All @@ -88,13 +89,13 @@
)

defer func() {
err := logger.Sync()
if err != nil {
err := l.Sync()
if logger.IsSyncError(err) {
log.Printf("logger sync error: %v\n", err)
}
}()

zap.ReplaceGlobals(logger)
zap.ReplaceGlobals(l)

exitCode := atomic.Int32{}

Expand All @@ -103,17 +104,17 @@
signalCtx, sigCancel := signal.NotifyContext(ctx, syscall.SIGTERM, syscall.SIGINT)
defer sigCancel()

logger.Info("Starting client proxy", zap.String("commit", commitSHA), zap.String("instance_id", instanceID))
l.Info("Starting client proxy", zap.String("commit", commitSHA), zap.String("instance_id", instanceID))

edgeSD, err := servicediscovery.BuildServiceDiscoveryProvider(ctx, config.EdgeServiceDiscovery, config.EdgePort, logger)
edgeSD, err := servicediscovery.BuildServiceDiscoveryProvider(ctx, config.EdgeServiceDiscovery, config.EdgePort, l)
if err != nil {
logger.Error("Failed to build edge discovery config", zap.Error(err))
l.Error("Failed to build edge discovery config", zap.Error(err))
return 1
}

orchestratorsSD, err := servicediscovery.BuildServiceDiscoveryProvider(ctx, config.OrchestratorServiceDiscovery, config.OrchestratorPort, logger)
orchestratorsSD, err := servicediscovery.BuildServiceDiscoveryProvider(ctx, config.OrchestratorServiceDiscovery, config.OrchestratorPort, l)
if err != nil {
logger.Error("Failed to build orchestrator discovery config", zap.Error(err))
l.Error("Failed to build orchestrator discovery config", zap.Error(err))
return 1
}

Expand All @@ -126,11 +127,11 @@
redisClient := redis.NewClient(&redis.Options{Addr: redisUrl, MinIdleConns: 1})
catalog = e2bcatalog.NewRedisSandboxesCatalog(redisClient)
} else {
logger.Warn("Redis environment variable is not set, will fallback to in-memory sandboxes catalog that works only with one instance setup")
l.Warn("Redis environment variable is not set, will fallback to in-memory sandboxes catalog that works only with one instance setup")
catalog = e2bcatalog.NewMemorySandboxesCatalog()
}

orchestrators := e2borchestrators.NewOrchestratorsPool(logger, tel.TracerProvider, tel.MeterProvider, orchestratorsSD)
orchestrators := e2borchestrators.NewOrchestratorsPool(l, tel.TracerProvider, tel.MeterProvider, orchestratorsSD)

info := &e2binfo.ServiceInfo{
NodeID: nodeID,
Expand All @@ -152,33 +153,33 @@
catalog,
)
if err != nil {
logger.Error("Failed to create client proxy", zap.Error(err))
l.Error("Failed to create client proxy", zap.Error(err))
return 1
}

authorizationManager := authorization.NewStaticTokenAuthorizationService(config.EdgeSecret)
edges := e2borchestrators.NewEdgePool(logger, edgeSD, info.Host, authorizationManager)
edges := e2borchestrators.NewEdgePool(l, edgeSD, info.Host, authorizationManager)

var closers []Closeable
closers = append(closers, orchestrators, edges)

edgeApiStore, err := edge.NewEdgeAPIStore(ctx, logger, info, edges, orchestrators, catalog, config)
edgeApiStore, err := edge.NewEdgeAPIStore(ctx, l, info, edges, orchestrators, catalog, config)
if err != nil {
logger.Error("failed to create edge api store", zap.Error(err))
l.Error("failed to create edge api store", zap.Error(err))
return 1
}

edgeApiSwagger, err := api.GetSwagger()
if err != nil {
logger.Error("Failed to get swagger", zap.Error(err))
l.Error("Failed to get swagger", zap.Error(err))
return 1
}

lisAddr := fmt.Sprintf("0.0.0.0:%d", config.EdgePort)
var lisCfg net.ListenConfig
lis, err := lisCfg.Listen(ctx, "tcp", lisAddr)
if err != nil {
logger.Error("Failed to listen on edge port", zap.Uint16("port", config.EdgePort), zap.Error(err))
l.Error("Failed to listen on edge port", zap.Uint16("port", config.EdgePort), zap.Error(err))
return 1
}

Expand All @@ -189,7 +190,7 @@
grpcSrv := edgepassthrough.NewNodePassThroughServer(orchestrators, info, authorizationManager, catalog)

// Edge REST API
restHttpHandler := edge.NewGinServer(logger, edgeApiStore, edgeApiSwagger, authorizationManager)
restHttpHandler := edge.NewGinServer(l, edgeApiStore, edgeApiSwagger, authorizationManager)
restListener := muxServer.Match(cmux.Any())
restSrv := &http.Server{Handler: restHttpHandler} // handler requests for REST API

Expand Down Expand Up @@ -237,7 +238,7 @@
// signaled.
defer sigCancel()

edgeRunLogger := logger.With(zap.Uint16("edge_port", config.EdgePort))
edgeRunLogger := l.With(zap.Uint16("edge_port", config.EdgePort))
edgeRunLogger.Info("Edge api starting")

err := muxServer.Serve()
Expand All @@ -264,7 +265,7 @@
// signaled.
defer sigCancel()

proxyRunLogger := logger.With(zap.Uint16("proxy_port", config.ProxyPort))
proxyRunLogger := l.With(zap.Uint16("proxy_port", config.ProxyPort))
proxyRunLogger.Info("Http proxy starting")

err := trafficProxy.ListenAndServe(ctx)
Expand Down Expand Up @@ -302,7 +303,7 @@
defer wg.Done()
<-signalCtx.Done()

shutdownLogger := logger.With(zap.Uint16("proxy_port", config.ProxyPort), zap.Uint16("edge_port", config.EdgePort))
shutdownLogger := l.With(zap.Uint16("proxy_port", config.ProxyPort), zap.Uint16("edge_port", config.EdgePort))
shutdownLogger.Info("Shutting down services")

edgeApiStore.SetDraining()
Expand Down
2 changes: 1 addition & 1 deletion packages/orchestrator/cmd/clean-nfs-cache/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func cleanNFSCache(ctx context.Context) error {
}))
defer func(l *zap.Logger) {
err := l.Sync()
if err != nil {
if logger.IsSyncError(err) {
log.Printf("error while shutting down logger: %v", err)
}
}(globalLogger)
Expand Down
Loading
Loading