Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(xtask): bound health-probe curls and detect wedged Docker port forwarding in doctor-local (#4881)

gbirmand4fbec0cc08f
diff --git a/tooling/xtask/crates/xtask_local/src/local/doctor.rs b/tooling/xtask/crates/xtask_local/src/local/doctor.rs
index 3de0acd5fc..a0e58aaa43 100644
--- a/tooling/xtask/crates/xtask_local/src/local/doctor.rs
+++ b/tooling/xtask/crates/xtask_local/src/local/doctor.rs
@@ -43,6 +43,7 @@ pub fn run(args: &InstanceArgs) -> Result<()> {
),
("rust target", check_rust_target()),
("ports", check_ports(&instance)),
+ ("port forwarding", check_port_forwarding(&instance)),
];
let mut failed = false;
@@ -141,6 +142,89 @@ fn check_rust_target() -> Status {
}
}
+/// Docker Desktop's VM can wedge so that a container's host port bindings are
+/// configured (`HostConfig.PortBindings`) but never activated
+/// (`NetworkSettings.Ports` stays empty): the container is healthy inside the
+/// VM while nothing on the host can reach it, and health probes hang instead
+/// of failing. Only a Docker Desktop restart recovers it.
+fn check_port_forwarding(instance: &Instance) -> Status {
+ let names: Vec<String> = match Command::new("docker")
+ .args([
+ "ps",
+ "--filter",
+ &format!(
+ "label=com.docker.compose.project={}",
+ instance.project_name()
+ ),
+ "--format",
+ "{{.Names}}",
+ ])
+ .output()
+ {
+ Ok(o) if o.status.success() => String::from_utf8_lossy(&o.stdout)
+ .lines()
+ .map(|l| l.trim().to_string())
+ .filter(|l| !l.is_empty())
+ .collect(),
+ _ => return Status::Warn("could not list this instance's containers".into()),
+ };
+ if names.is_empty() {
+ return Status::Ok("no running containers for this instance".into());
+ }
+
+ let mut cmd = Command::new("docker");
+ cmd.args([
+ "inspect",
+ "--format",
+ "{{.Name}}\t{{json .HostConfig.PortBindings}}\t{{json .NetworkSettings.Ports}}",
+ ])
+ .args(&names);
+ let out = match cmd.output() {
+ Ok(o) if o.status.success() => String::from_utf8_lossy(&o.stdout).to_string(),
+ _ => return Status::Warn("docker inspect failed".into()),
+ };
+
+ let non_empty_array = |v: Option<&serde_json::Value>| -> bool {
+ v.and_then(|v| v.as_array()).is_some_and(|a| !a.is_empty())
+ };
+ let mut wedged: Vec<String> = Vec::new();
+ for line in out.lines() {
+ let mut parts = line.splitn(3, '\t');
+ let (Some(name), Some(configured), Some(active)) =
+ (parts.next(), parts.next(), parts.next())
+ else {
+ continue;
+ };
+ let configured: serde_json::Value = serde_json::from_str(configured).unwrap_or_default();
+ let active: serde_json::Value = serde_json::from_str(active).unwrap_or_default();
+ let Some(configured) = configured.as_object() else {
+ continue;
+ };
+ for (port, bindings) in configured {
+ if non_empty_array(Some(bindings)) && !non_empty_array(active.get(port)) {
+ wedged.push(format!("{} {port}", name.trim_start_matches('/')));
+ }
+ }
+ }
+
+ if wedged.is_empty() {
+ Status::Ok(format!(
+ "{} running container(s) publish their configured ports",
+ names.len()
+ ))
+ } else {
+ Status::Fail {
+ msg: format!(
+ "host bindings configured but inactive: {}",
+ wedged.join(", ")
+ ),
+ hint: Some(
+ "Docker Desktop's VM port forwarding is wedged — restart Docker Desktop".into(),
+ ),
+ }
+ }
+}
+
fn check_ports(instance: &Instance) -> Status {
let busy = instance.busy_ports();
if busy.is_empty() {
diff --git a/tooling/xtask/crates/xtask_local/src/local/frontend.rs b/tooling/xtask/crates/xtask_local/src/local/frontend.rs
index 4e0bc5f954..804e19dbbd 100644
--- a/tooling/xtask/crates/xtask_local/src/local/frontend.rs
+++ b/tooling/xtask/crates/xtask_local/src/local/frontend.rs
@@ -108,7 +108,7 @@ fn dev_env(instance: &Instance) -> Vec<(String, String)> {
pub fn wait_backend_ready(stage: &Stage, instance: &Instance) -> Result<()> {
let url = format!("{}/auth/health", proxy::url(instance));
let script = format!(
- "for i in $(seq 1 60); do curl -fsS {url} >/dev/null 2>&1 && exit 0; sleep 2; done; echo 'backend not ready'; exit 1"
+ "for i in $(seq 1 60); do curl -fsS --max-time 3 {url} >/dev/null 2>&1 && exit 0; sleep 2; done; echo 'backend not ready'; exit 1"
);
let mut cmd = Command::new("bash");
cmd.arg("-lc").arg(script);
diff --git a/tooling/xtask/crates/xtask_local/src/local/fusionauth.rs b/tooling/xtask/crates/xtask_local/src/local/fusionauth.rs
index 860898ad15..03da067469 100644
--- a/tooling/xtask/crates/xtask_local/src/local/fusionauth.rs
+++ b/tooling/xtask/crates/xtask_local/src/local/fusionauth.rs
@@ -68,7 +68,7 @@ pub fn wait_ready(stage: &Stage, instance: &Instance) -> Result<()> {
identity::APPLICATION_ID,
);
let script = format!(
- "for i in $(seq 1 120); do curl -fsS -H 'Authorization: {key}' {url} >/dev/null 2>&1 && exit 0; sleep 2; done; \
+ "for i in $(seq 1 120); do curl -fsS --max-time 3 -H 'Authorization: {key}' {url} >/dev/null 2>&1 && exit 0; sleep 2; done; \
echo 'timed out waiting for the FusionAuth kickstart'; exit 1",
key = identity::FUSIONAUTH_API_KEY,
);
diff --git a/tooling/xtask/crates/xtask_local/src/local/mod.rs b/tooling/xtask/crates/xtask_local/src/local/mod.rs
index 540af0be0b..e42d0bd0ce 100644
--- a/tooling/xtask/crates/xtask_local/src/local/mod.rs
+++ b/tooling/xtask/crates/xtask_local/src/local/mod.rs
@@ -766,7 +766,7 @@ fn ensure_external_resources(stage: &Stage, instance: &Instance) -> Result<()> {
fn wait_http(stage: &Stage, label: &str, url: &str) -> Result<()> {
let script = format!(
- "for i in $(seq 1 60); do curl -fsS {url} >/dev/null 2>&1 && exit 0; sleep 2; done; echo 'not ready: {url}'; exit 1"
+ "for i in $(seq 1 60); do curl -fsS --max-time 3 {url} >/dev/null 2>&1 && exit 0; sleep 2; done; echo 'not ready: {url}'; exit 1"
);
let mut cmd = Command::new("bash");
cmd.arg("-lc").arg(script);