add error status (#2746)

* add error status

* update types

* ṗ̶̰̙̓͒̈́ͅü̵̢̙̫̣ŗ̷̪̺̺͛g̴̲͉͎̬̒̇e̵̪̎̅͌ ̶̡̜̘͐͛t̶͎͍̣̿̍̐h̴͕̩͗̈́̎̑e̵͚͒̂͝ ̸̛͙̦͈͝v̶̱͙̬̽̔ọ̶̧̡̒̓i̸̬̲͍̋̈́d̴͉̀

* fix some extra voids

* add `package.rebuild`

* introduce error status and pkg rebuild and fix mocks

* minor fixes

* fix build

---------

Co-authored-by: Matt Hill <mattnine@protonmail.com>

core/startos/src/disk/mount/util.rs

@@ -5,6 +5,16 @@ use tracing::instrument;
 use crate::util::Invoke;
 use crate::Error;
 
+pub async fn is_mountpoint(path: impl AsRef<Path>) -> Result<bool, Error> {
+    let is_mountpoint = tokio::process::Command::new("mountpoint")
+        .arg(path.as_ref())
+        .stdout(std::process::Stdio::null())
+        .stderr(std::process::Stdio::null())
+        .status()
+        .await?;
+    Ok(is_mountpoint.success())
+}
+
 #[instrument(skip_all)]
 pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
     src: P0,
@@ -16,13 +26,7 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
         src.as_ref().display(),
         dst.as_ref().display()
     );
-    let is_mountpoint = tokio::process::Command::new("mountpoint")
-        .arg(dst.as_ref())
-        .stdout(std::process::Stdio::null())
-        .stderr(std::process::Stdio::null())
-        .status()
-        .await?;
-    if is_mountpoint.success() {
+    if is_mountpoint(&dst).await? {
         unmount(dst.as_ref(), true).await?;
     }
     tokio::fs::create_dir_all(&src).await?;

core/startos/src/lib.rs

@@ -292,6 +292,13 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                 .no_display()
                 .with_call_remote::<CliContext>(),
         )
+        .subcommand(
+            "rebuild",
+            from_fn_async(service::rebuild)
+                .with_metadata("sync_db", Value::Bool(true))
+                .no_display()
+                .with_call_remote::<CliContext>(),
+        )
         .subcommand("logs", logs::package_logs())
         .subcommand(
             "logs",

core/startos/src/lxc/mod.rs

@@ -126,7 +126,8 @@ impl LxcManager {
                         Path::new(LXC_CONTAINER_DIR).join(container).join("rootfs"),
                         true,
                     )
-                    .await?;
+                    .await
+                    .log_err();
                     if tokio_stream::wrappers::ReadDirStream::new(
                         tokio::fs::read_dir(&rootfs_path).await?,
                     )

core/startos/src/service/mod.rs

@@ -589,6 +589,15 @@ impl ServiceActorSeed {
     }
 }
 
+#[derive(Deserialize, Serialize, Parser, TS)]
+pub struct RebuildParams {
+    pub id: PackageId,
+}
+pub async fn rebuild(ctx: RpcContext, RebuildParams { id }: RebuildParams) -> Result<(), Error> {
+    ctx.services.load(&ctx, &id, LoadDisposition::Retry).await?;
+    Ok(())
+}
+
 #[derive(Deserialize, Serialize, Parser, TS)]
 pub struct ConnectParams {
     pub id: PackageId,

core/startos/src/service/service_map.rs

@@ -7,6 +7,7 @@ use futures::{Future, FutureExt};
 use helpers::NonDetachingJoinHandle;
 use imbl::OrdMap;
 use imbl_value::InternedString;
+use models::ErrorData;
 use tokio::sync::{Mutex, OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
 use tracing::instrument;
 
@@ -22,6 +23,7 @@ use crate::progress::{FullProgressTracker, PhaseProgressTrackerHandle, ProgressT
 use crate::s9pk::manifest::PackageId;
 use crate::s9pk::merkle_archive::source::FileSource;
 use crate::s9pk::S9pk;
+use crate::service::start_stop::StartStop;
 use crate::service::{LoadDisposition, Service, ServiceRef};
 use crate::status::MainStatus;
 use crate::util::serde::Pem;
@@ -87,8 +89,30 @@ impl ServiceMap {
         if let Some(service) = service.take() {
             shutdown_err = service.shutdown().await;
         }
-        // TODO: retry on error?
-        *service = Service::load(ctx, id, disposition).await?.map(From::from);
+        match Service::load(ctx, id, disposition).await {
+            Ok(s) => *service = s.into(),
+            Err(e) => {
+                let e = ErrorData::from(e);
+                ctx.db
+                    .mutate(|db| {
+                        if let Some(pde) = db.as_public_mut().as_package_data_mut().as_idx_mut(id) {
+                            pde.as_status_mut().map_mutate(|s| {
+                                Ok(MainStatus::Error {
+                                    on_rebuild: if s.running() {
+                                        StartStop::Start
+                                    } else {
+                                        StartStop::Stop
+                                    },
+                                    message: e.details,
+                                    debug: Some(e.debug),
+                                })
+                            })?;
+                        }
+                        Ok(())
+                    })
+                    .await?;
+            }
+        }
         shutdown_err?;
         Ok(())
     }

core/startos/src/status/mod.rs

@@ -17,6 +17,11 @@ pub mod health_check;
 #[serde(rename_all = "camelCase")]
 #[serde(rename_all_fields = "camelCase")]
 pub enum MainStatus {
+    Error {
+        on_rebuild: StartStop,
+        message: String,
+        debug: Option<String>,
+    },
     Stopped,
     Restarting,
     Restoring,
@@ -43,12 +48,20 @@ impl MainStatus {
             | MainStatus::Restarting
             | MainStatus::BackingUp {
                 on_complete: StartStop::Start,
+            }
+            | MainStatus::Error {
+                on_rebuild: StartStop::Start,
+                ..
             } => true,
             MainStatus::Stopped
             | MainStatus::Restoring
             | MainStatus::Stopping { .. }
             | MainStatus::BackingUp {
                 on_complete: StartStop::Stop,
+            }
+            | MainStatus::Error {
+                on_rebuild: StartStop::Stop,
+                ..
             } => false,
         }
     }
@@ -70,7 +83,8 @@ impl MainStatus {
             | MainStatus::Stopped
             | MainStatus::Restoring
             | MainStatus::Stopping { .. }
-            | MainStatus::Restarting => None,
+            | MainStatus::Restarting
+            | MainStatus::Error { .. } => None,
         }
     }
 }