timeout streams that already ended after a minute

DolceTriade · Feb 2, 2024 · 8ead3f8 · 8ead3f8
1 parent f8f6a93
commit 8ead3f8
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 0 deletions.
diff --git a/blade/bep/lib.rs b/blade/bep/lib.rs
@@ -113,6 +113,33 @@ impl publish_build_event_server::PublishBuildEvent for BuildEventService {
                                 if session_uuid.is_empty() {
                                     session_uuid = uuid.clone();
                                     log::info!("{}: Stream started", session_uuid);
+                                    let mut already_over = false;
+                                    if let Ok(mut db) = global.db_manager.as_ref().get() {
+                                        if let Ok(inv) = db.get_shallow_invocation(&session_uuid) {
+                                            if let Some(end) = inv.end {
+                                                if std::time::SystemTime::now()
+                                                    .duration_since(end)
+                                                    .unwrap_or(std::time::Duration::from_secs(0))
+                                                    > std::time::Duration::from_secs(60)
+                                                {
+                                                    already_over = true;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    if already_over {
+                                        log::warn!("{}: session already ended", session_uuid);
+
+                                        let _ = tx
+                                            .send(Err(Status::new(
+                                                tonic::Code::FailedPrecondition,
+                                                "session already ended",
+                                            )))
+                                            .await
+                                            .ok();
+                                        return;
+                                    }
+
                                     if let Ok(mut db) = global.db_manager.as_ref().get() {
                                         let _ = db
                                             .update_shallow_invocation(

diff --git a/blade/db/postgres/mod.rs b/blade/db/postgres/mod.rs
@@ -232,6 +232,17 @@ impl state::DB for Postgres {
             .context("failed to get progress")
     }
 
+    fn get_shallow_invocation(
+        &mut self,
+        invocation_id: &str,
+    ) -> anyhow::Result<state::InvocationResults> {
+        schema::invocations::table
+            .select(models::Invocation::as_select())
+            .filter(schema::invocations::id.eq(invocation_id))
+            .get_result(&mut self.conn)
+            .map(|res| res.into_state())
+            .context("failed to get shallow invocation")
+    }
     fn update_target_result(
         &mut self,
         invocation_id: &str,

diff --git a/blade/db/sqlite/mod.rs b/blade/db/sqlite/mod.rs
@@ -237,6 +237,18 @@ impl state::DB for Sqlite {
             .context("failed to get progress")
     }
 
+    fn get_shallow_invocation(
+        &mut self,
+        invocation_id: &str,
+    ) -> anyhow::Result<state::InvocationResults> {
+        schema::Invocations::table
+            .select(models::Invocation::as_select())
+            .filter(schema::Invocations::id.eq(invocation_id))
+            .get_result(&mut self.conn)
+            .map(|res| res.into_state())
+            .context("failed to get shallow invocation")
+    }
+
     fn update_target_result(
         &mut self,
         invocation_id: &str,

diff --git a/blade/routes/details.rs b/blade/routes/details.rs
@@ -52,6 +52,7 @@ pub fn Details() -> impl IntoView {
                                                     view! { <h3>Build Metadata</h3> }
                                                 }
                                             >
+
                                                 <BuildMetadata md=opts.build_metadata/>
                                             </AccordionItem>
 
@@ -61,6 +62,7 @@ pub fn Details() -> impl IntoView {
                                                     view! { <h3>Explicit Command Line</h3> }
                                                 }
                                             >
+
                                                 <OptionsList opts=opts.explicit_cmd_line/>
                                             </AccordionItem>
                                             <AccordionItem
@@ -69,6 +71,7 @@ pub fn Details() -> impl IntoView {
                                                     view! { <h3>Command Line</h3> }
                                                 }
                                             >
+
                                                 <OptionsList opts=opts.cmd_line/>
                                             </AccordionItem>
                                             <AccordionItem
@@ -77,6 +80,7 @@ pub fn Details() -> impl IntoView {
                                                     view! { <h3>Unstructured Command Line</h3> }
                                                 }
                                             >
+
                                                 <OptionsList opts=opts.unstructured/>
                                             </AccordionItem>
                                             <AccordionItem
@@ -85,6 +89,7 @@ pub fn Details() -> impl IntoView {
                                                     view! { <h3>Explicit Startup Command Line</h3> }
                                                 }
                                             >
+
                                                 <OptionsList opts=opts.explicit_startup/>
                                             </AccordionItem>
                                             <AccordionItem
@@ -93,6 +98,7 @@ pub fn Details() -> impl IntoView {
                                                     view! { <h3>Startup Command Line</h3> }
                                                 }
                                             >
+
                                                 <OptionsList opts=opts.startup/>
                                             </AccordionItem>
 

diff --git a/blade/state/lib.rs b/blade/state/lib.rs
@@ -122,6 +122,7 @@ pub trait DB {
     fn update_test_result(&mut self, invocation_id: &str, name: &str, status: Status, duration: std::time::Duration, num_runs: usize) -> anyhow::Result<()>;
     fn upsert_test_run(&mut self, id: &str, test_id: &str, run: &TestRun) -> anyhow::Result<()>;
     fn get_invocation(&mut self, id: &str) -> anyhow::Result<InvocationResults>;
+    fn get_shallow_invocation(&mut self, id: &str) -> anyhow::Result<InvocationResults>;
     fn delete_invocation(&mut self, id: &str) -> anyhow::Result<()>;
     fn delete_invocations_since(&mut self, ts: &std::time::SystemTime) -> anyhow::Result<usize>;
     fn insert_options(&mut self, id: &str, options: &BuildOptions) -> anyhow::Result<()>;