Skip to content

Commit c2fda92

Browse files
committed
chore(sandbox): remove obsolete image task routing
1 parent a996881 commit c2fda92

3 files changed

Lines changed: 3 additions & 67 deletions

File tree

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { task } from '@trigger.dev/sdk'
22
import {
3-
LEGACY_SANDBOX_IMAGE_BUILD_TASK_ID,
4-
PREVIOUS_SANDBOX_IMAGE_BUILD_TASK_ID,
53
runSandboxImageBuild,
64
SANDBOX_IMAGE_BUILD_TASK_ID,
75
type SandboxImageBuildPayload,
@@ -29,38 +27,3 @@ export const sandboxImageBuildTask = task({
2927
await runSandboxImageBuild(payload)
3028
},
3129
})
32-
33-
/**
34-
* Rollout bridge for web replicas deployed before revisioned task routing.
35-
* Remove only after every old web release that emits this ID has drained.
36-
*/
37-
export const legacySandboxImageBuildTask = task({
38-
id: LEGACY_SANDBOX_IMAGE_BUILD_TASK_ID,
39-
machine: 'small-1x',
40-
maxDuration: 1200,
41-
retry: { maxAttempts: 1 },
42-
queue: {
43-
name: 'sandbox-image-build',
44-
concurrencyLimit: 5,
45-
},
46-
run: async (payload: SandboxImageBuildPayload) => {
47-
await runSandboxImageBuild(payload)
48-
},
49-
})
50-
51-
/** One-revision bridge for a worker-first materializer rollout. */
52-
export const previousSandboxImageBuildTask = PREVIOUS_SANDBOX_IMAGE_BUILD_TASK_ID
53-
? task({
54-
id: PREVIOUS_SANDBOX_IMAGE_BUILD_TASK_ID,
55-
machine: 'small-1x',
56-
maxDuration: 1200,
57-
retry: { maxAttempts: 1 },
58-
queue: {
59-
name: 'sandbox-image-build',
60-
concurrencyLimit: 5,
61-
},
62-
run: async (payload: SandboxImageBuildPayload) => {
63-
await runSandboxImageBuild(payload)
64-
},
65-
})
66-
: undefined

apps/sim/lib/execution/remote-sandbox/image-registry.test.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,10 @@ import {
119119
cleanupSandboxImages,
120120
ensureSandboxImage,
121121
FAILED_BUILD_RETRY_COOLDOWN_MS,
122-
LEGACY_SANDBOX_IMAGE_BUILD_TASK_ID,
123-
PREVIOUS_SANDBOX_IMAGE_BUILD_TASK_ID,
124122
releaseSandboxImage,
125123
runSandboxImageBuild,
126124
SANDBOX_IMAGE_BUILD_TASK_ID,
127125
sandboxBuildIdempotencyKey,
128-
sandboxImageBuildTaskIds,
129126
} from '@/lib/execution/remote-sandbox/image-registry'
130127

131128
const READY_IMAGE = {
@@ -519,15 +516,8 @@ describe('runSandboxImageBuild attempt ownership', () => {
519516
systemPackages: [],
520517
}
521518

522-
it('routes each renderer revision to a distinct Trigger.dev task ID', () => {
523-
expect(SANDBOX_IMAGE_BUILD_TASK_ID).toBe('sandbox-image-build-v2')
524-
expect(PREVIOUS_SANDBOX_IMAGE_BUILD_TASK_ID).toBe('sandbox-image-build-v1')
525-
expect(LEGACY_SANDBOX_IMAGE_BUILD_TASK_ID).toBe('sandbox-image-build')
526-
expect(sandboxImageBuildTaskIds(2)).toEqual({
527-
current: 'sandbox-image-build-v2',
528-
previous: 'sandbox-image-build-v1',
529-
legacy: 'sandbox-image-build',
530-
})
519+
it('uses one stable Trigger.dev task ID', () => {
520+
expect(SANDBOX_IMAGE_BUILD_TASK_ID).toBe('sandbox-image-build')
531521
})
532522

533523
it('refuses an app-new/task-old renderer mismatch before claiming the row', async () => {

apps/sim/lib/execution/remote-sandbox/image-registry.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
providerBuildError,
1818
type SandboxBuildError,
1919
} from '@/lib/execution/remote-sandbox/build-errors'
20-
import { FUNCTION_SANDBOX_MATERIALIZER_REVISION } from '@/lib/execution/remote-sandbox/function-resources'
2120
import { resolveProvider } from '@/lib/execution/remote-sandbox/provider'
2221
import { invalidateSandboxResolution } from '@/lib/execution/remote-sandbox/resolve'
2322
import type { SandboxSpec } from '@/lib/execution/remote-sandbox/sandbox-spec'
@@ -44,23 +43,7 @@ const STALE_BUILD_MS = BUILD_POLL_CAP_MS * 2
4443
const POLL_BASE_MS = 3_000
4544
const POLL_MAX_MS = 20_000
4645

47-
/** Task IDs kept live together so either web-first or worker-first rollouts drain safely. */
48-
export function sandboxImageBuildTaskIds(rendererRevision: number): {
49-
current: string
50-
previous?: string
51-
legacy: string
52-
} {
53-
return {
54-
current: `sandbox-image-build-v${rendererRevision}`,
55-
...(rendererRevision > 1 ? { previous: `sandbox-image-build-v${rendererRevision - 1}` } : {}),
56-
legacy: 'sandbox-image-build',
57-
}
58-
}
59-
60-
const SANDBOX_IMAGE_TASK_IDS = sandboxImageBuildTaskIds(FUNCTION_SANDBOX_MATERIALIZER_REVISION)
61-
export const SANDBOX_IMAGE_BUILD_TASK_ID = SANDBOX_IMAGE_TASK_IDS.current
62-
export const PREVIOUS_SANDBOX_IMAGE_BUILD_TASK_ID = SANDBOX_IMAGE_TASK_IDS.previous
63-
export const LEGACY_SANDBOX_IMAGE_BUILD_TASK_ID = SANDBOX_IMAGE_TASK_IDS.legacy
46+
export const SANDBOX_IMAGE_BUILD_TASK_ID = 'sandbox-image-build'
6447

6548
export interface SandboxImageBuildPayload {
6649
provider: SandboxProviderId

0 commit comments

Comments
 (0)