lib: add support for soft-reboots #1392
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
lib/src/cli.rs
Outdated
| if can_soft_reboot { | ||
| println!("Staged deployment is soft-reboot capable, performing soft-reboot..."); | ||
|
|
||
| // Find the index of the staged deployment | ||
| let deployments_list = sysroot.deployments(); | ||
| let staged_index = deployments_list | ||
| .iter() | ||
| .position(|d| d.is_staged()) | ||
| .ok_or_else(|| anyhow::anyhow!("Failed to find staged deployment index"))?; | ||
|
|
||
| // Prepare the soft-reboot using ostree admin prepare-soft-reboot | ||
| let mut cmd = std::process::Command::new("ostree"); | ||
| cmd.args(["admin", "prepare-soft-reboot", &staged_index.to_string()]); | ||
| let status = cmd.status().context("Failed to run ostree admin prepare-soft-reboot")?; | ||
| if !status.success() { | ||
| anyhow::bail!("ostree admin prepare-soft-reboot failed"); | ||
| } | ||
|
|
||
| // Perform the soft-reboot | ||
| crate::reboot::soft_reboot()?; | ||
| } else { | ||
| crate::reboot::reboot()?; | ||
| } |
There was a problem hiding this comment.
The if can_soft_reboot block is duplicated in the switch function. The logic for preparing and executing the soft reboot is also present in the rollback function. Extract this logic into helper functions to improve maintainability.
lib/src/cli.rs
Outdated
| // Prepare the soft-reboot using ostree admin prepare-soft-reboot | ||
| let mut cmd = std::process::Command::new("ostree"); | ||
| cmd.args(["admin", "prepare-soft-reboot", &target_index.to_string()]); | ||
| let status = cmd.status().context("Failed to run ostree admin prepare-soft-reboot")?; | ||
| if !status.success() { | ||
| anyhow::bail!("ostree admin prepare-soft-reboot failed"); | ||
| } | ||
|
|
||
| // Perform the soft-reboot | ||
| crate::reboot::soft_reboot()?; |
There was a problem hiding this comment.
The logic to prepare and execute the soft reboot is duplicated from the upgrade and switch functions. Extract this into a shared helper function to reduce code duplication.
lib/src/status.rs
Outdated
| if entry.soft_reboot_capable { | ||
| write_row_name(&mut out, "Soft-reboot", prefix_len)?; | ||
| writeln!(out, "capable")?; | ||
| } |
There was a problem hiding this comment.
This logic to display the soft_reboot_capable status is duplicated in human_render_slot (lines 425-428). The pinned status and the tracing::debug! call are also duplicated. Consider extracting this common rendering logic into a helper function.
There was a problem hiding this comment.
removed for now will be added with --verbose on #1399
jmarrero
force-pushed
the
soft-reboots
branch
4 times, most recently
from
f063416 to
825778d
Compare
jmarrero
changed the title
lib/src/cli.rs
Outdated
| let deployments_list = sysroot.deployments(); | ||
| let staged_deployment = deployments_list | ||
| .iter() | ||
| .find(|d| d.is_staged()) |
There was a problem hiding this comment.
I think this is what we need to do at the moment, the code is fine.
However just looking at things overall, we should probably try to refactor in the future so that we have a clear staged state that has both the status object and the deployment and we shouldn't then need the unwrap_or and error checking here.
jmarrero
force-pushed
the
soft-reboots
branch
2 times, most recently
from
521dd3a to
408dbd9
Compare
Co-authored-by: Colin Walters <[email protected]> Signed-off-by: Joseph Marrero Corchado <[email protected]>
| crate::deploy::rollback(sysroot).await?; | ||
|
|
||
| if can_soft_reboot { | ||
| soft_reboot_rollback(sysroot)?; |
There was a problem hiding this comment.
Since this function is only called once so it could be inlined, but OK as is
|
Moving to draft since this is blocked until we either:
|
|
That said one thing that would be cool would be us keeping cached container images for PRs on In this PR (actually the dependency one) we could explicitly bump the ostree version even before it's shipped $everywhere. |
depends on ostreedev/ostree#3455