fixup! Add SubmissionCancelled to SubmissionStatus

PR cleanup

Author: jerbaroo

libs/opsqueue_python/python/opsqueue/exceptions.py

@@ -106,7 +106,7 @@ class SubmissionNotFoundError(IncorrectUsageError):
     but the submission doesn't exist within the Opsqueue.
     """
 
-    __slots = ["submission_id"]
+    __slots__ = ["submission_id"]
 
     def __init__(
         self,

libs/opsqueue_python/python/opsqueue/producer.py

@@ -324,7 +324,7 @@ def cancel_submission(self, submission_id: SubmissionId) -> None:
         """
         Cancel a specific submission that is in progress.
 
-        Returns None if the submission was succesfully cancelled.
+        Returns None if the submission was successfully cancelled.
 
         Raises:
         - `SubmissionNotCancellableError` if the submission could not be

libs/opsqueue_python/src/lib.rs

@@ -23,6 +23,7 @@ fn opsqueue_internal(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<common::Submission>()?;
     m.add_class::<common::SubmissionCompleted>()?;
     m.add_class::<common::SubmissionFailed>()?;
+    m.add_class::<common::SubmissionCancelled>()?;
     m.add_class::<common::SubmissionNotCancellable>()?;
     m.add_class::<producer::PyChunksIter>()?;
     m.add_class::<consumer::ConsumerClient>()?;

opsqueue/src/common/submission.rs

@@ -710,7 +710,7 @@ pub mod db {
                             Ok(Some(SubmissionStatus::Cancelled(submission))) => {
                                 Err(E::R(E::R(SubmissionNotCancellable::Cancelled(submission))))
                             }
-                            Err(_) => Ok(()),
+                            Err(db_err) => Err(E::L(db_err)),
                         }
                     }
                 }
@@ -902,7 +902,7 @@ pub mod db {
                 // Clean up old submissions_metadata
                 query!(
                     "DELETE FROM submissions_metadata
-                    WHERE submission_id = (
+                    WHERE submission_id IN (
                         SELECT id FROM submissions_completed WHERE completed_at < julianday($1)
                     );",
                     older_than
@@ -911,7 +911,7 @@ pub mod db {
                 .await?;
                 query!(
                     "DELETE FROM submissions_metadata
-                    WHERE submission_id = (
+                    WHERE submission_id IN (
                         SELECT id FROM submissions_failed WHERE failed_at < julianday($1)
                     );",
                     older_than
@@ -920,7 +920,7 @@ pub mod db {
                 .await?;
                 query!(
                     "DELETE FROM submissions_metadata
-                    WHERE submission_id = (
+                    WHERE submission_id IN (
                         SELECT id FROM submissions_cancelled WHERE cancelled_at < julianday($1)
                     );",
                     older_than

opsqueue/src/producer/client.rs

@@ -145,7 +145,7 @@ impl Client {
                     .map_err(|e| E::R(E::R(e.into())))?;
                 return Err(E::<_, E<_, InternalProducerClientError>>::L(not_found_err));
             }
-            // 404, the submission could not be cancelled.
+            // 409, the submission could not be cancelled.
             if status == StatusCode::CONFLICT {
                 let not_cancellable_err = response
                     .json::<errors::SubmissionNotCancellable>()

opsqueue/src/prometheus.rs

@@ -56,7 +56,14 @@ pub fn describe_metrics() {
         Unit::Count,
         "Number of submissions failed permanently"
     );
+    describe_counter!(
+        SUBMISSIONS_CANCELLED_COUNTER,
+        Unit::Count,
+        "Number of submissions cancelled permanently"
+    );
     describe_histogram!(SUBMISSIONS_DURATION_COMPLETE_HISTOGRAM, Unit::Seconds, "Time between a submission entering the system and its final chunk being completed. Does not count failed submissions.");
+    describe_histogram!(SUBMISSIONS_DURATION_FAIL_HISTOGRAM, Unit::Seconds, "Time between a submission entering the system and its first chunk being failed.");
+    describe_histogram!(SUBMISSIONS_DURATION_CANCEL_HISTOGRAM, Unit::Seconds, "Time between a submission entering the system and its first chunk being canceled.");
 
     describe_counter!(
         CHUNKS_COMPLETED_COUNTER,