Skip to content

Fix wait command to always check replica count #106

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

Merged
firecow merged 2 commits into from
Feb 2, 2026
Merged

Fix wait command to always check replica count #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f51cf4
Fix wait command to always check replica count
firecow Jan 31, 2026
a755711
Use explicit in-progress states instead of inverted logic
firecow Feb 1, 2026
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
21 changes: 9 additions & 12 deletions src/commands/wait-cmd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,21 @@ export async function handler (args: ArgumentsCamelCase) {

serviceStateMap = new Map<string, string>();
services = await dockerode.listServices({filters: {label: [`com.docker.stack.namespace=${appName}`]}});
tasks = await dockerode.listTasks({filters: {"label": [`com.docker.stack.namespace=${appName}`], "desired-state": ["running"]}}) as Task[];
tasks = await dockerode.listTasks({filters: {"label": [`com.docker.stack.namespace=${appName}`]}}) as Task[];

for (const s of services) {
if (s.UpdateStatus?.State) {
const runningTasks = tasks.filter((t) => t.Status.State === "running" && t.ServiceID === s.ID);
const desiredReplicas = s.Spec?.Mode?.Replicated?.Replicas ?? 0;

// Always check replica count first - compare running tasks against desired replicas
Comment thread
firecow marked this conversation as resolved.
if (runningTasks.length < desiredReplicas) {
serviceStateMap.set(s.ID, "replicating");
} else if (s.UpdateStatus?.State && ["updating", "paused", "rollback_started", "rollback_paused"].includes(s.UpdateStatus.State)) {
serviceStateMap.set(s.ID, s.UpdateStatus.State);
} else {
const runningTasks = tasks.filter((t) => t.Status.State === "running" && t.ServiceID === s.ID);
const totalTasks = tasks.filter((t) => t.ServiceID === s.ID);
if (totalTasks.length > runningTasks.length) {
serviceStateMap.set(s.ID, "replicating");
}
}
}

const servicesUpdating = [];
for (const [id, state] of serviceStateMap) {
if (!["completed", "rollback_completed"].includes(state)) servicesUpdating.push([id, state]);
}
const servicesUpdating = [...serviceStateMap.entries()];

bail = servicesUpdating.length === 0;
if (!bail) {
Expand Down