[LizBaldo]

Problem

When createInstance fails immediately (e.g. ZONE_RESOURCE_POOL_EXHAUSTED), Leo creates the NFS disk in GCP but the VM is never created. The disk is created but never attached to any VM.

The disk cleanup in deleteApp records the disk's getLastDetachTimestamp and then polls until the timestamp changes (indicating detach). For a never-attached disk GCP returns null for that field. Both the original and every subsequent reading are Some(null), so they compare equal — the DoneCheckable never fires and the wait times out after 250 s (50 × 5 s). The timeout exception is swallowed by handleErrorWith in cleanUpAfterCreateAppError, and the disk stays Ready in the DB.

On the next create attempt Leo finds the Ready disk, sets restore=true, passes restore_galaxy=true to ansible, and ansible aborts because the disk has no Galaxy data. Cleanup in restore mode does not delete the disk (diskId = None), so the disk is stuck permanently.

This was exposed more prominently by the fast-fail change in #4933: before that, createInstance appeared async and Leo polled for 30 min, giving time for the VM (and disk attachment) to reach a terminal state before cleanup ran.

Fix

• Normalise null → None via Option(getLastDetachTimestamp) when recording original timestamps for both the NFS data disk and the postgres disk.
• Add an early-exit clause to diskDetachDone: if the original timestamp is None (disk was never attached), return true immediately — no wait needed, the disk is already safe to delete.

Ticket: https://broadworkbench.atlassian.net/browse/CTM-678

🤖 Generated with Claude Code

[jgainerdewar]

Ugh

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 73.71%. Comparing base (b98d3d4) to head (063b69a).

Additional details and impacted files

@@           Coverage Diff            @@
##           develop    #4938   +/-   ##
========================================
  Coverage    73.71%   73.71%           
========================================
  Files          131      131           
  Lines        11262    11263    +1     
  Branches       916      933   +17     
========================================
+ Hits          8302     8303    +1     
  Misses        2960     2960           

Files with missing lines	Coverage Δ
.../leonardo/monitor/LeoPubsubMessageSubscriber.scala	76.83% <100.00%> (+0.02%)	⬆️

---

Continue to review full report in Codecov by Harness.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b98d3d4...063b69a. Read the comment docs.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.