vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(#977): abort phase 5 if stop fails; clean up old root.conf after rename

Browse source
This commit is contained in:
damocles 2026-06-01 18:30:59 +02:00 • committed by mara
commit 4d934748f7
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hive-c0re/src/migrate.rs
View file

@ -187,9 +187,19 @@ async fn rename_manager_container(coord: &Arc<Coordinator>) {
tracing::info!("migration phase 5: renaming root container to h-root"); tracing::info!("migration phase 5: renaming root container to h-root");
let _guard = coord.transient_guard(MANAGER_NAME, crate::coordinator::TransientKind::Rebuilding); let _guard = coord.transient_guard(MANAGER_NAME, crate::coordinator::TransientKind::Rebuilding);
// Stop the old container. // Stop the old container. Abort if stop fails — continuing with a
if let Err(e) = Command::new("nixos-container").args(["stop", "root"]).status().await { // running `root` and then starting `h-root` risks two manager
tracing::warn!(error = ?e, "migration phase 5: nixos-container stop root failed"); // instances racing for the same broker / state files.
match Command::new("nixos-container").args(["stop", "root"]).status().await {
Ok(s) if s.success() => {}
Ok(s) => {
tracing::warn!(status = %s, "migration phase 5: nixos-container stop root failed — aborting");
return;
}
Err(e) => {
tracing::warn!(error = ?e, "migration phase 5: nixos-container stop root failed — aborting");
return;
}
} }
// Copy conf file. // Copy conf file.
@ -220,6 +230,12 @@ async fn rename_manager_container(coord: &Arc<Coordinator>) {
tracing::info!("migration phase 5: root container renamed to h-root"); tracing::info!("migration phase 5: root container renamed to h-root");
let _ = std::fs::write(hroot_rename_marker(), b"done\n"); let _ = std::fs::write(hroot_rename_marker(), b"done\n");
// Clean up the old conf file so `nixos-container list` doesn't show
// a stale stopped `root` entry. Best-effort; a failure here is
// harmless — h-root is already running and the marker is written.
if let Err(e) = std::fs::remove_file(&old_conf) {
tracing::warn!(error = ?e, "migration phase 5: remove old root.conf failed (non-fatal)");
}
} }
async fn enumerate_agents() -> Vec<String> { async fn enumerate_agents() -> Vec<String> {