From 79275c22cf58caaea55b4b1b330cb7e6e30578ab Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 21 Mar 2024 09:24:44 -0400
Subject: [PATCH] install: Add some more debug/trace calls

John is hitting an issue where we're failing to re-exec into
the mount namespace when querying podman for some reason.  We
log surprisingly little even at trace level before we get there.
I don't think this will help debug it, but I had to carefully
read the code to know that e.g. we've verified we're not running
under rootless podman until the time we get there.

More logging especially at trace level is ~free so let's
do it.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 lib/src/cli.rs     | 1 +
 lib/src/install.rs | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/lib/src/cli.rs b/lib/src/cli.rs
index 008e387b4..85c1c7357 100644
--- a/lib/src/cli.rs
+++ b/lib/src/cli.rs
@@ -286,6 +286,7 @@ pub(crate) fn require_root() -> Result<()> {
     if !rustix::thread::capability_is_in_bounding_set(rustix::thread::Capability::SystemAdmin)? {
         anyhow::bail!("This command requires full root privileges (CAP_SYS_ADMIN)");
     }
+    tracing::trace!("Verified uid 0 with CAP_SYS_ADMIN");
     Ok(())
 }
 
diff --git a/lib/src/install.rs b/lib/src/install.rs
index 2a133205e..90a5293dd 100644
--- a/lib/src/install.rs
+++ b/lib/src/install.rs
@@ -436,6 +436,7 @@ impl SourceInfo {
             transport: ostree_container::Transport::ContainerStorage,
             name: container_info.image.clone(),
         };
+        tracing::debug!("Finding digest for image ID {}", container_info.imageid);
         let digest = crate::podman::imageid_to_digest(&container_info.imageid)?;
 
         let root = Dir::open_ambient_dir("/", cap_std::ambient_authority())?;
@@ -848,6 +849,7 @@ fn require_host_pidns() -> Result<()> {
     if rustix::process::getpid().is_init() {
         anyhow::bail!("This command must be run with --pid=host")
     }
+    tracing::trace!("OK: we're not pid 1");
     Ok(())
 }
 
@@ -975,6 +977,7 @@ async fn prepare_install(
     source_opts: InstallSourceOpts,
     target_opts: InstallTargetOpts,
 ) -> Result<Arc<State>> {
+    tracing::trace!("Preparing install");
     // We need full root privileges, i.e. --privileged in podman
     crate::cli::require_root()?;
     require_host_pidns()?;
@@ -996,6 +999,7 @@ async fn prepare_install(
                     "Cannot install from rootless podman; this command must be run as root"
                 );
             }
+            tracing::trace!("Read container engine info {:?}", container_info.engine);
 
             SourceInfo::from_container(&container_info)?
         }