A deploy that changes the runner's image or its container settings rolls every idle sandbox over at once (--containers-rollout=immediate), where Cloudflare's default rollout went in steps over wall-clock time and, with deploys often half an hour apart, never reached every sandbox: jobs kept starting on old images and old machine sizes. A change to the container settings alone, such as the instance type, now rolls out too; before, an unchanged image meant --containers-rollout none and the new settings were never applied. Busy sandboxes still get rollout_active_grace_period to finish. · e277e3f · flagon-io/g1t

66	66		} from "./deploy/image.mjs";
67	67		import { decide, git, planJson, pool, table } from "./deploy/plan.mjs";
68	68		import { reportDeployment } from "./deploy/report.mjs";
69		−	import { ROOT, byStage, codeStages, findWranglerConfigs, npmCiArgs, npmWorkspace, pick, problems, resolvedStack, waves } from "./deploy/stack.mjs";
	69	+	import { ROOT, byStage, codeStages, containersRollout, findWranglerConfigs, npmCiArgs, npmWorkspace, pick, problems, resolvedStack, waves } from "./deploy/stack.mjs";
70	70		import { withDeployWindow } from "./deploy/status-window.mjs";
71	71
72	72		const USAGE = "usage: node scripts/deploy.mjs plan\|deploy\|build\|migrate\|manifest\|doctor\|install\|build-base\|image [--all] [--only a,b] [--skip a,b] [--force] [--rollback] [--concurrency N] [--stage S] [--json]";
⋯
361	361		// Wrangler is given the image by reference, so it builds nothing.
362	362		const image = await runnerImage(unit, { dryRun, docker, rebuildImage, rebuildBase }, out);
363	363		args.push("--config", writeDeployConfig(unit, image.ref));
364		−	// Nothing the image is built from changed: the running sandboxes
365		−	// keep going, and new ones start from the same image.
366		−	if (!rebuildImage && !rebuildBase && !decision.image) args.push("--containers-rollout", "none");
	364	+	args.push("--containers-rollout", containersRollout(unit, decision, { rebuildImage, rebuildBase }));
367	365		result.note = image.note;
368	366		}
369	367		// Tried again after a wait when Cloudflare, not what is deployed, is

49	49		findWranglerConfigs,
50	50		loadStack,
51	51		npmCiArgs,
	52	+	containersRollout,
52	53		npmWorkspace,
53	54		outsideImports,
54	55		parseJsonc,
⋯
860	861		assert.equal(retryableDeploy("✘ [ERROR] Processing wrangler.jsonc configuration:\n - \"main\" is not a valid path"), false);
861	862		assert.equal(retryableDeploy("fetch failed: ECONNRESET"), true);
862	863		});
	864	+
	865	+	test("sandboxes roll over at once when their image or container settings changed, and not otherwise", () => {
	866	+	const unit = { id: "runner", path: "services/runner" };
	867	+	assert.equal(containersRollout(unit, { image: true, files: [] }), "immediate");
	868	+	assert.equal(containersRollout(unit, { image: false, files: ["services/runner/wrangler.jsonc"] }), "immediate");
	869	+	assert.equal(containersRollout(unit, { image: false, files: ["services/runner/src/egress.ts"] }), "none");
	870	+	assert.equal(containersRollout(unit, { image: false, files: ["services/runnerx/wrangler.jsonc"] }), "none");
	871	+	assert.equal(containersRollout(unit, { image: false, files: [] }, { rebuildImage: true }), "immediate");
	872	+	});

486	486		}
487	487
488	488		/**
	489	+	* How a unit with a Containers image rolls its sandboxes over: `immediate`
	490	+	* when what they run changed (the image, or the container settings in its
	491	+	* wrangler.jsonc, such as the instance type), else `none`. Cloudflare's
	492	+	* default rollout goes in steps over wall-clock time, so with deploys
	493	+	* often apart a new version never reached every sandbox; `immediate`
	494	+	* replaces the idle ones at once, and `rollout_active_grace_period` still
	495	+	* keeps a sandbox in the middle of a job from being stopped.
	496	+	*/
	497	+	export function containersRollout(unit, decision, { rebuildImage = false, rebuildBase = false } = {}) {
	498	+	const config = (file) => file.startsWith(`${unit.path}/`) && /wrangler\.jsonc?$/.test(file);
	499	+	const changed = rebuildImage \|\| rebuildBase \|\| decision.image \|\| (decision.files ?? []).some(config);
	500	+	return changed ? "immediate" : "none";
	501	+	}
	502	+
	503	+	/**
489	504		* npm ci of only what the units need: Wrangler alone for Rust workers,
490	505		* and each npm-built unit's workspace with the packages it uses. A CI job
491	506		* that deploys three Rust workers does not install the site's toolchain.

25	25		// hosted label), and all other work: 2 vCPU, 8 GiB, 16 GB.
26	26		"instance_type": "standard-3",
27	27		"max_instances": 20,
28		−	// A deploy replaces sandboxes. Ones that are busy are given this
29		−	// long, in seconds, to finish first, so shipping g1t does not
	28	+	// A deploy that changes the image or these settings replaces every
	29	+	// idle sandbox at once (scripts/deploy.mjs passes
	30	+	// --containers-rollout=immediate). Ones that are busy are given
	31	+	// this long, in seconds, to finish first, so shipping g1t does not
30	32		// kill work in the middle.
31	33		"rollout_active_grace_period": 7200
32	34		},

flagon-io/g1t