diff --git a/packages/api/internal/sandbox/storage/memory/sync.go b/packages/api/internal/sandbox/storage/memory/sync.go index 019855535d..98ae936bd3 100644 --- a/packages/api/internal/sandbox/storage/memory/sync.go +++ b/packages/api/internal/sandbox/storage/memory/sync.go @@ -1,9 +1,11 @@ package memory import ( + "context" "time" "github.com/e2b-dev/infra/packages/api/internal/sandbox" + "github.com/e2b-dev/infra/packages/shared/pkg/logger" ) // TODO: this should be removed once we have a better way to handle node sync @@ -37,6 +39,13 @@ func (s *Storage) Sync(sandboxes []sandbox.Sandbox, nodeID string) []sandbox.San _, found := sandboxMap[data.SandboxID] if !found { + logger.L().Debug( + context.Background(), + "sync expiring sandbox missing from node report", + logger.WithSandboxID(data.SandboxID), + logger.WithTeamID(data.TeamID.String()), + logger.WithNodeID(nodeID), + ) item.SetExpired() } }) @@ -48,6 +57,13 @@ func (s *Storage) Sync(sandboxes []sandbox.Sandbox, nodeID string) []sandbox.San continue } + logger.L().Debug( + context.Background(), + "sync discovered sandbox missing from cache", + logger.WithSandboxID(sandbox.SandboxID), + logger.WithTeamID(sandbox.TeamID.String()), + logger.WithNodeID(nodeID), + ) toBeAdded = append(toBeAdded, sandbox) } diff --git a/packages/api/internal/sandbox/store.go b/packages/api/internal/sandbox/store.go index 3302ca29fc..cd6ddc7a57 100644 --- a/packages/api/internal/sandbox/store.go +++ b/packages/api/internal/sandbox/store.go @@ -158,6 +158,13 @@ func (s *Store) WaitForStateChange(ctx context.Context, teamID uuid.UUID, sandbo func (s *Store) Sync(ctx context.Context, sandboxes []Sandbox, nodeID string) { sbxs := s.storage.Sync(sandboxes, nodeID) for _, sbx := range sbxs { + logger.L().Debug( + ctx, + "re-adding sandbox during sync", + logger.WithSandboxID(sbx.SandboxID), + logger.WithTeamID(sbx.TeamID.String()), + logger.WithNodeID(nodeID), + ) err := s.Add(ctx, sbx, false) if err != nil { logger.L().Error(ctx, "Failed to re-add sandbox during sync", zap.Error(err), logger.WithSandboxID(sbx.SandboxID)) diff --git a/packages/shared/pkg/sandbox-catalog/catalog_memory.go b/packages/shared/pkg/sandbox-catalog/catalog_memory.go index b922117bc4..aec8ba6e0c 100644 --- a/packages/shared/pkg/sandbox-catalog/catalog_memory.go +++ b/packages/shared/pkg/sandbox-catalog/catalog_memory.go @@ -6,6 +6,8 @@ import ( "time" "github.com/jellydator/ttlcache/v3" + + "github.com/e2b-dev/infra/packages/shared/pkg/logger" ) type MemorySandboxCatalog struct { @@ -45,6 +47,8 @@ func (c *MemorySandboxCatalog) StoreSandbox(ctx context.Context, sandboxID strin _, span := tracer.Start(ctx, "sandbox-catalog-store") defer span.End() + logger.L().Debug(ctx, "storing sandbox in memory catalog", logger.WithSandboxID(sandboxID)) + c.mtx.Lock() defer c.mtx.Unlock() @@ -75,6 +79,7 @@ func (c *MemorySandboxCatalog) DeleteSandbox(ctx context.Context, sandboxID stri return nil } + logger.L().Debug(ctx, "deleting sandbox from memory catalog", logger.WithSandboxID(sandboxID)) c.cache.Delete(sandboxID) return nil diff --git a/packages/shared/pkg/sandbox-catalog/catalog_redis.go b/packages/shared/pkg/sandbox-catalog/catalog_redis.go index a22d2a5eec..f59d395976 100644 --- a/packages/shared/pkg/sandbox-catalog/catalog_redis.go +++ b/packages/shared/pkg/sandbox-catalog/catalog_redis.go @@ -86,6 +86,8 @@ func (c *RedisSandboxCatalog) StoreSandbox(ctx context.Context, sandboxID string spanCtx, span := tracer.Start(ctx, "sandbox-catalog-store") defer span.End() + logger.L().Debug(ctx, "storing sandbox in redis catalog", logger.WithSandboxID(sandboxID)) + ctx, ctxCancel := context.WithTimeout(spanCtx, catalogRedisTimeout) defer ctxCancel() @@ -132,6 +134,7 @@ func (c *RedisSandboxCatalog) DeleteSandbox(ctx context.Context, sandboxID strin return nil } + logger.L().Debug(ctx, "deleting sandbox from redis catalog", logger.WithSandboxID(sandboxID)) c.redisClient.Del(ctx, c.getCatalogKey(sandboxID)) c.cache.Delete(sandboxID)