lix-project/lix-installer
15
3
Fork 4
Code Issues 18 Code Review (Gerrit) Projects Activity

Trim up some output/timings for logs and joins

Browse source 
Signed-off-by: Ana Hobden <operator@hoverbear.org>
This commit is contained in:
Ana Hobden 2022-09-29 11:02:37 -07:00
parent 08f1410f6a
commit d675647fc9
4 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/actions/base/fetch_nix.rs
View file

@ -71,18 +71,12 @@ impl Actionable for FetchNix {
// TODO(@Hoverbear): Pick directory
tracing::trace!("Unpacking tar.xz");
let dest_clone = dest.clone();
let handle: Result<(), Self::Error> = spawn_blocking(move || {
let decoder = xz2::read::XzDecoder::new(bytes.reader());
let mut archive = tar::Archive::new(decoder);
archive
.unpack(&dest_clone)
.map_err(Self::Error::Unarchive)?;
tracing::debug!(dest = %dest_clone.display(), "Downloaded & extracted Nix");
Ok(())
})
.await?;
handle?;
let decoder = xz2::read::XzDecoder::new(bytes.reader());
let mut archive = tar::Archive::new(decoder);
archive
.unpack(&dest_clone)
.map_err(Self::Error::Unarchive)?;
tracing::trace!("Fetched Nix");
*action_state = ActionState::Completed;

8
src/actions/base/move_unpacked_nix.rs
View file

@ -63,12 +63,14 @@ impl Actionable for MoveUnpackedNix {
);
let found_nix_path = found_nix_paths.into_iter().next().unwrap();
tracing::trace!("Renaming");
let src = found_nix_path.join("store");
let src_store = found_nix_path.join("store");
let dest = Path::new(DEST);
tokio::fs::rename(src.clone(), dest)
tokio::fs::rename(src_store.clone(), dest)
.await
.map_err(|e| MoveUnpackedNixError::Rename(src, dest.to_owned(), e))?;
.map_err(|e| MoveUnpackedNixError::Rename(src_store.clone(), dest.to_owned(), e))?;
tokio::fs::remove_dir_all(src).await
.map_err(|e| MoveUnpackedNixError::Rename(src_store, dest.to_owned(), e))?;
tracing::trace!("Moved Nix");
*action_state = ActionState::Completed;
Ok(())

1
src/actions/meta/create_nix_tree.rs
View file

@ -4,7 +4,6 @@ use crate::actions::base::{CreateDirectory, CreateDirectoryError};
use crate::actions::{Action, ActionDescription, ActionState, Actionable};
const PATHS: &[&str] = &[
"/nix",
"/nix/var",
"/nix/var/log",
"/nix/var/log/nix",

51
src/actions/meta/provision_nix.rs
View file

@ -1,8 +1,9 @@
use std::path::PathBuf;
use serde::Serialize;
use tempdir::TempDir;
use tokio::task::JoinError;
use crate::actions::base::{FetchNix, FetchNixError, MoveUnpackedNix, MoveUnpackedNixError};
use crate::actions::base::{FetchNix, FetchNixError, MoveUnpackedNix, MoveUnpackedNixError, CreateDirectory, CreateDirectoryError};
use crate::InstallSettings;
use crate::actions::{Action, ActionDescription, ActionState, Actionable};
@ -11,6 +12,7 @@ use super::{CreateNixTree, CreateNixTreeError, CreateUsersAndGroup, CreateUsersA
#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
pub struct ProvisionNix {
create_nix_dir: CreateDirectory,
fetch_nix: FetchNix,
create_users_and_group: CreateUsersAndGroup,
create_nix_tree: CreateNixTree,
@ -21,17 +23,18 @@ pub struct ProvisionNix {
impl ProvisionNix {
#[tracing::instrument(skip_all)]
pub async fn plan(settings: InstallSettings) -> Result<Self, ProvisionNixError> {
let tempdir = TempDir::new("nix").map_err(ProvisionNixError::TempDir)?;
let create_nix_dir = CreateDirectory::plan("/nix", "root".into(), "root".into(), 0o0755, settings.force).await?;
let fetch_nix = FetchNix::plan(
settings.nix_package_url.clone(),
tempdir.path().to_path_buf(),
PathBuf::from("/nix/temp-install-dir"),
)
.await?;
let create_users_and_group = CreateUsersAndGroup::plan(settings.clone()).await?;
let create_nix_tree = CreateNixTree::plan(settings.force).await?;
let move_unpacked_nix = MoveUnpackedNix::plan(tempdir.path().to_path_buf()).await?;
let move_unpacked_nix = MoveUnpackedNix::plan(PathBuf::from("/nix/temp-install-dir")).await?;
Ok(Self {
create_nix_dir,
fetch_nix,
create_users_and_group,
create_nix_tree,
@ -46,6 +49,7 @@ impl Actionable for ProvisionNix {
type Error = ProvisionNixError;
fn describe_execute(&self) -> Vec<ActionDescription> {
let Self {
create_nix_dir,
fetch_nix,
create_users_and_group,
create_nix_tree,
@ -55,7 +59,9 @@ impl Actionable for ProvisionNix {
if self.action_state == ActionState::Completed {
vec![]
} else {
let mut buf = fetch_nix.describe_execute();
let mut buf = Vec::default();
buf.append(&mut create_nix_dir.describe_execute());
buf.append(&mut fetch_nix.describe_execute());
buf.append(&mut create_users_and_group.describe_execute());
buf.append(&mut create_nix_tree.describe_execute());
buf.append(&mut move_unpacked_nix.describe_execute());
@ -67,6 +73,7 @@ impl Actionable for ProvisionNix {
#[tracing::instrument(skip_all)]
async fn execute(&mut self) -> Result<(), Self::Error> {
let Self {
create_nix_dir,
fetch_nix,
create_nix_tree,
create_users_and_group,
@ -80,6 +87,8 @@ impl Actionable for ProvisionNix {
*action_state = ActionState::Progress;
tracing::debug!("Provisioning Nix");
create_nix_dir.execute().await?;
// We fetch nix while doing the rest, then move it over.
let mut fetch_nix_clone = fetch_nix.clone();
let fetch_nix_handle = tokio::task::spawn(async {
@ -103,6 +112,7 @@ impl Actionable for ProvisionNix {
fn describe_revert(&self) -> Vec<ActionDescription> {
let Self {
create_nix_dir,
fetch_nix,
create_users_and_group,
create_nix_tree,
@ -117,6 +127,7 @@ impl Actionable for ProvisionNix {
buf.append(&mut create_nix_tree.describe_revert());
buf.append(&mut create_users_and_group.describe_revert());
buf.append(&mut fetch_nix.describe_revert());
buf.append(&mut create_nix_dir.describe_revert());
buf
}
}
@ -124,6 +135,7 @@ impl Actionable for ProvisionNix {
#[tracing::instrument(skip_all)]
async fn revert(&mut self) -> Result<(), Self::Error> {
let Self {
create_nix_dir,
fetch_nix,
create_nix_tree,
create_users_and_group,
@ -144,15 +156,20 @@ impl Actionable for ProvisionNix {
Result::<_, Self::Error>::Ok(fetch_nix_clone)
});
create_users_and_group.revert().await?;
create_nix_tree
.revert()
.await
.map_err(ProvisionNixError::from)?;
if let Err(err) = create_users_and_group.revert().await {
fetch_nix_handle.abort();
return Err(Self::Error::from(err));
}
if let Err(err) = create_nix_tree.revert().await {
fetch_nix_handle.abort();
return Err(Self::Error::from(err));
}
*fetch_nix = fetch_nix_handle.await.map_err(ProvisionNixError::from)??;
move_unpacked_nix.revert().await?;
create_nix_dir.revert().await?;
tracing::trace!("Unprovisioned Nix");
*action_state = ActionState::Uncompleted;
Ok(())
@ -167,12 +184,6 @@ impl From<ProvisionNix> for Action {
#[derive(Debug, thiserror::Error, Serialize)]
pub enum ProvisionNixError {
#[error("Failed create tempdir")]
TempDir(
#[source]
#[serde(serialize_with = "crate::serialize_error_to_display")]
std::io::Error,
),
#[error("Fetching Nix")]
FetchNix(
#[source]
@ -186,6 +197,12 @@ pub enum ProvisionNixError {
#[serde(serialize_with = "crate::serialize_error_to_display")]
JoinError,
),
#[error("Creating directory")]
CreateDirectory(
#[source]
#[from]
CreateDirectoryError,
),
#[error("Creating users and group")]
CreateUsersAndGroup(
#[source]