Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't lazily unmount unless on error

Browse Source
This commit is contained in:
Aiden McClelland
2024-07-29 11:15:25 -06:00
parent dafa638558
commit 08003c59b6
6 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/startos/src/context/setup.rs
View File

@@ -100,18 +100,6 @@ impl SetupContext {
.with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?; .with_ctx(|_| (crate::ErrorKind::Filesystem, db_path.display().to_string()))?;
Ok(db) Ok(db)
} }
#[instrument(skip_all)]
pub async fn secret_store(&self) -> Result<PgPool, Error> {
init_postgres(&self.datadir).await?;
let secret_store =
PgPool::connect_with(PgConnectOptions::new().database("secrets").username("root"))
.await?;
sqlx::migrate!()
.run(&secret_store)
.await
.with_kind(crate::ErrorKind::Database)?;
Ok(secret_store)
}
pub fn run_setup<F, Fut>(&self, f: F) -> Result<(), Error> pub fn run_setup<F, Fut>(&self, f: F) -> Result<(), Error>
where where

2
core/startos/src/disk/main.rs
View File

@@ -168,7 +168,7 @@ pub async fn create_all_fs<P: AsRef<Path>>(
#[instrument(skip_all)] #[instrument(skip_all)]
pub async fn unmount_fs<P: AsRef<Path>>(guid: &str, datadir: P, name: &str) -> Result<(), Error> { pub async fn unmount_fs<P: AsRef<Path>>(guid: &str, datadir: P, name: &str) -> Result<(), Error> {
unmount(datadir.as_ref().join(name)).await?; unmount(datadir.as_ref().join(name), false).await?;
if !guid.ends_with("_UNENC") { if !guid.ends_with("_UNENC") {
Command::new("cryptsetup") Command::new("cryptsetup")
.arg("-q") .arg("-q")

4
core/startos/src/disk/mount/guard.rs
View File

@@ -74,7 +74,7 @@ impl MountGuard {
} }
pub async fn unmount(mut self, delete_mountpoint: bool) -> Result<(), Error> { pub async fn unmount(mut self, delete_mountpoint: bool) -> Result<(), Error> {
if self.mounted { if self.mounted {
unmount(&self.mountpoint).await?; unmount(&self.mountpoint, false).await?;
if delete_mountpoint { if delete_mountpoint {
match tokio::fs::remove_dir(&self.mountpoint).await { match tokio::fs::remove_dir(&self.mountpoint).await {
Err(e) if e.raw_os_error() == Some(39) => Ok(()), // directory not empty Err(e) if e.raw_os_error() == Some(39) => Ok(()), // directory not empty
@@ -96,7 +96,7 @@ impl Drop for MountGuard {
fn drop(&mut self) { fn drop(&mut self) {
if self.mounted { if self.mounted {
let mountpoint = std::mem::take(&mut self.mountpoint); let mountpoint = std::mem::take(&mut self.mountpoint);
tokio::spawn(async move { unmount(mountpoint).await.unwrap() }); tokio::spawn(async move { unmount(mountpoint, true).await.unwrap() });
} }
} }
} }

13
core/startos/src/disk/mount/util.rs
View File

@@ -23,7 +23,7 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
.status() .status()
.await?; .await?;
if is_mountpoint.success() { if is_mountpoint.success() {
unmount(dst.as_ref()).await?; unmount(dst.as_ref(), true).await?;
} }
tokio::fs::create_dir_all(&src).await?; tokio::fs::create_dir_all(&src).await?;
tokio::fs::create_dir_all(&dst).await?; tokio::fs::create_dir_all(&dst).await?;
@@ -41,11 +41,14 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
} }
#[instrument(skip_all)] #[instrument(skip_all)]
pub async fn unmount<P: AsRef<Path>>(mountpoint: P) -> Result<(), Error> { pub async fn unmount<P: AsRef<Path>>(mountpoint: P, lazy: bool) -> Result<(), Error> {
tracing::debug!("Unmounting {}.", mountpoint.as_ref().display()); tracing::debug!("Unmounting {}.", mountpoint.as_ref().display());
tokio::process::Command::new("umount") let mut cmd = tokio::process::Command::new("umount");
.arg("-Rl") cmd.arg("-R");
.arg(mountpoint.as_ref()) if lazy {
cmd.arg("-l");
}
cmd.arg(mountpoint.as_ref())
.invoke(crate::ErrorKind::Filesystem) .invoke(crate::ErrorKind::Filesystem)
.await?; .await?;
Ok(()) Ok(())

2
core/startos/src/init.rs
View File

@@ -65,7 +65,7 @@ pub async fn init_postgres(datadir: impl AsRef<Path>) -> Result<(), Error> {
.await? .await?
.success() .success()
{ {
unmount("/var/lib/postgresql").await?; unmount("/var/lib/postgresql", true).await?;
} }
let exists = tokio::fs::metadata(&db_dir).await.is_ok(); let exists = tokio::fs::metadata(&db_dir).await.is_ok();
if !exists { if !exists {

6
core/startos/src/lxc/mod.rs
View File

@@ -123,7 +123,11 @@ impl LxcManager {
if !expected.contains(&ContainerId::try_from(container)?) { if !expected.contains(&ContainerId::try_from(container)?) {
let rootfs_path = Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs"); let rootfs_path = Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs");
if tokio::fs::metadata(&rootfs_path).await.is_ok() { if tokio::fs::metadata(&rootfs_path).await.is_ok() {
unmount(Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs")).await?; unmount(
Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs"),
true,
)
.await?;
if tokio_stream::wrappers::ReadDirStream::new( if tokio_stream::wrappers::ReadDirStream::new(
tokio::fs::read_dir(&rootfs_path).await?, tokio::fs::read_dir(&rootfs_path).await?,
) )