Merge branch 'main' into remove-affected-row-check

p2panda · Jul 26, 2023 · 157f59d · 157f59d
2 parents 55c5d0b + 25707ca
commit 157f59d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,6 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use fork of `asynchronous-codec` to temporarily fix CBOR decoding bug [#440](https://github.com/p2panda/aquadoggo/pull/440)
 - Fix composing of circuit relay address [#451](https://github.com/p2panda/aquadoggo/pull/451)
 - Don't check for `affected_rows` on task deletion [#461](https://github.com/p2panda/aquadoggo/pull/461)
+- Do not critically fail when view does not exist due to race condition [#460](https://github.com/p2panda/aquadoggo/pull/460)
 
 ### Open Sauce
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aquadoggo/Cargo.toml b/aquadoggo/Cargo.toml
@@ -23,7 +23,7 @@ anyhow = "1.0.62"
 async-graphql = { version = "5.0.6", features = ["dynamic-schema"] }
 async-graphql-axum = "5.0.6"
 async-trait = "0.1.64"
-asynchronous-codec = { git = "https://github.com/p2panda/asynchronous-codec", rev = "6eef38b30ade6ce2d66accc966652bd15d74e274", features = ["cbor"] }
+asynchronous-codec = { version = "0.6.2", features = ["cbor"] }
 axum = "0.6.10"
 bamboo-rs-core-ed25519-yasmf = "0.1.1"
 bs58 = "0.4.0"

diff --git a/aquadoggo/src/materializer/tasks/dependency.rs b/aquadoggo/src/materializer/tasks/dependency.rs
@@ -49,9 +49,10 @@ pub async fn dependency_task(context: Context, input: TaskInput) -> TaskResult<T
         }
         // If no document with the view for the id passed into this task could be retrieved then
         // this document has been deleted or the document view does not exist. As "dependency"
-        // tasks are only dispatched after a successful "reduce" task, neither `None` case should
-        // happen, so this is a critical error.
-        None => Err(TaskError::Critical(format!(
+        // tasks are only dispatched after a successful "reduce" task this is fairly rare, usually
+        // a result of a race condition where other tasks changed the state before the "dependency"
+        // task got dispatched.
+        None => Err(TaskError::Failure(format!(
             "Expected document with view {} not found in store",
             view_id
         ))),