From 20470e9a6d56882465bd748dca836f5cc70e4f71 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 6 Oct 2020 09:22:56 -0400
Subject: [PATCH] main: Add more error context

I was debugging a failure to write the statefile which
turned out to be me having
https://github.com/coreos/fedora-coreos-config/pull/659
locally.

Anyways let's add some error context to aid future debugging.
---
 src/bootupd.rs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/bootupd.rs b/src/bootupd.rs
index 744a6589..d909e174 100644
--- a/src/bootupd.rs
+++ b/src/bootupd.rs
@@ -50,7 +50,7 @@ pub(crate) fn install(source_root: &str, dest_root: &str) -> Result<()> {
     }
 
     let sysroot = openat::Dir::open(dest_root)?;
-    update_state(&sysroot, &state)?;
+    update_state(&sysroot, &state).context("Failed to update state")?;
 
     Ok(())
 }
@@ -109,7 +109,7 @@ pub(crate) enum ComponentUpdateResult {
 /// daemon implementation of component update
 pub(crate) fn update(name: &str) -> Result<ComponentUpdateResult> {
     let sysroot = openat::Dir::open("/")?;
-    let _lock = acquire_write_lock("/")?;
+    let _lock = acquire_write_lock("/").context("Failed to acquire write lock")?;
     let mut state = get_saved_state("/")?.unwrap_or_else(|| SavedState {
         ..Default::default()
     });
@@ -128,7 +128,7 @@ pub(crate) fn update(name: &str) -> Result<ComponentUpdateResult> {
     let interrupted = pending_container.get(component.name()).cloned();
 
     pending_container.insert(component.name().into(), update.clone());
-    update_state(&sysroot, &state)?;
+    update_state(&sysroot, &state).context("Failed to update state")?;
     let newinst = component
         .run_update(&inst)
         .with_context(|| format!("Failed to update {}", component.name()))?;
@@ -160,7 +160,9 @@ pub(crate) fn validate(name: &str) -> Result<ValidationResult> {
 fn update_state(sysroot_dir: &openat::Dir, state: &SavedState) -> Result<()> {
     let subdir = sysroot_dir.sub_dir(STATEFILE_DIR)?;
     let f = {
-        let f = subdir.new_unnamed_file(0o644)?;
+        let f = subdir
+            .new_unnamed_file(0o644)
+            .context("creating temp file")?;
         let mut buff = std::io::BufWriter::new(f);
         serde_json::to_writer(&mut buff, state)?;
         buff.flush()?;
@@ -174,11 +176,17 @@ fn update_state(sysroot_dir: &openat::Dir, state: &SavedState) -> Result<()> {
     };
     let dest_tmp_name = Path::new(&dest_tmp_name);
     if subdir.exists(dest_tmp_name)? {
-        subdir.remove_file(dest_tmp_name)?;
+        subdir
+            .remove_file(dest_tmp_name)
+            .context("Removing temp file")?;
     }
-    subdir.link_file_at(&f, dest_tmp_name)?;
-    f.sync_all()?;
-    subdir.local_rename(dest_tmp_name, STATEFILE_NAME)?;
+    subdir
+        .link_file_at(&f, dest_tmp_name)
+        .context("Linking temp file")?;
+    f.sync_all().context("syncing")?;
+    subdir
+        .local_rename(dest_tmp_name, STATEFILE_NAME)
+        .context("Renaming temp file")?;
     Ok(())
 }