Skip to content

Track sandbox firecracker process errors and return them when requesting sandbox #412

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
0div wants to merge 4 commits into from
Closed

Track sandbox firecracker process errors and return them when requesting sandbox #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ac0972
start using redis client in ochestrator server and storing sandbox er…
0div Mar 11, 2025
3e9a8d0
fix merge conflicts with main
0div Mar 11, 2025
8ae230d
Merge branch 'main' of https://github.com/e2b-dev/infra into distingu…
0div Mar 12, 2025
1698d6e
Merge branch 'main' of https://github.com/e2b-dev/infra into distingu…
0div Mar 13, 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
18 changes: 17 additions & 1 deletion packages/orchestrator/internal/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"os"
"sync"

"github.com/go-redis/redis/v8"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector"
Expand Down Expand Up @@ -48,6 +49,8 @@ type server struct {

useLokiMetrics string
useClickhouseMetrics string

redisClient *redis.Client
}

type Service struct {
Expand Down Expand Up @@ -91,7 +94,19 @@ func New(ctx context.Context, port uint, clientID string) (*Service, error) {

// BLOCK: initialize services
{
srv.dns = dns.New()
var redisClient *redis.Client
if rurl := os.Getenv("REDIS_URL"); rurl != "" {
opts, err := redis.ParseURL(rurl)
if err != nil {
zap.L().Fatal("invalid redis URL", zap.String("url", rurl), zap.Error(err))
}

redisClient = redis.NewClient(opts)
} else {
zap.L().Warn("REDIS_URL not set, using local caches")
}

srv.dns = dns.New(redisClient)

opts := []logging.Option{
logging.WithLogOnEvents(logging.StartCall, logging.PayloadReceived, logging.PayloadSent, logging.FinishCall),
Expand Down Expand Up @@ -151,6 +166,7 @@ func New(ctx context.Context, port uint, clientID string) (*Service, error) {
clickhouseStore: clickhouseStore,
useLokiMetrics: useLokiMetrics,
useClickhouseMetrics: useClickhouseMetrics,
redisClient: redisClient,
}
}

Expand Down
5 changes: 3 additions & 2 deletions packages/orchestrator/internal/server/sandboxes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ func (s *server) Create(ctxConn context.Context, req *orchestrator.SandboxCreate
waitErr := sbx.Wait()
if waitErr != nil {
sbxlogger.I(sbx).Error("failed to wait for sandbox, cleaning up", zap.Error(waitErr))
s.redisClient.Set(ctx, fmt.Sprintf("sbx:%s:error", req.Sandbox.SandboxId), waitErr.Error(), 0)
}

cleanupErr := cleanup.Run()
Expand Down Expand Up @@ -181,7 +182,7 @@ func (s *server) Delete(ctxConn context.Context, in *orchestrator.SandboxDeleteR
}

// Don't allow connecting to the sandbox anymore.
s.dns.Remove(in.SandboxId, sbx.Slot.HostIP())
s.dns.Remove(ctx, in.SandboxId, sbx.Slot.HostIP())

// Remove the sandbox from the cache to prevent loading it again in API during the time the instance is stopping.
// Old comment:
Expand Down Expand Up @@ -235,7 +236,7 @@ func (s *server) Pause(ctx context.Context, in *orchestrator.SandboxPauseRequest
return nil, status.New(codes.NotFound, errMsg.Error()).Err()
}

s.dns.Remove(in.SandboxId, sbx.Slot.HostIP())
s.dns.Remove(ctx, in.SandboxId, sbx.Slot.HostIP())
s.sandboxes.Remove(in.SandboxId)

s.pauseMu.Unlock()
Expand Down
Loading