Merge pull request #278 from Holo-Host/read-tx-queue-mgmt

[TK-03008] drop read transactions while waiting for new queue work
holochain · Aug 6, 2020 · 53cfe42 · 53cfe42
2 parents 29df8d1 + 7b327c7
commit 53cfe42
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/crates/dna_util/Cargo.toml b/crates/dna_util/Cargo.toml
@@ -24,7 +24,3 @@ tokio = { version = "0.2", features = [ "full" ] }
 
 [dev-dependencies]
 tempdir = "0.3.7"
-
-
-[patch.crates-io]
-
diff --git a/crates/holochain/src/core/queue_consumer/app_validation_consumer.rs b/crates/holochain/src/core/queue_consumer/app_validation_consumer.rs
@@ -51,6 +51,9 @@ pub fn spawn_app_validation_consumer(
             tokio::pin!(next_job);
             tokio::pin!(kill);
 
+            // drop the reader so we don't lock it until the next job!
+            drop(reader);
+
             if let Either::Left((Err(_), _)) | Either::Right((_, _)) =
                 futures::future::select(next_job, kill).await
             {

diff --git a/crates/holochain/src/core/queue_consumer/integrate_dht_ops_consumer.rs b/crates/holochain/src/core/queue_consumer/integrate_dht_ops_consumer.rs
@@ -50,6 +50,9 @@ pub fn spawn_integrate_dht_ops_consumer(
             tokio::pin!(next_job);
             tokio::pin!(kill);
 
+            // drop the reader so we don't lock it until the next job!
+            drop(reader);
+
             if let Either::Left((Err(_), _)) | Either::Right((_, _)) =
                 futures::future::select(next_job, kill).await
             {

diff --git a/crates/holochain/src/core/queue_consumer/produce_dht_ops_consumer.rs b/crates/holochain/src/core/queue_consumer/produce_dht_ops_consumer.rs
@@ -51,6 +51,9 @@ pub fn spawn_produce_dht_ops_consumer(
             tokio::pin!(next_job);
             tokio::pin!(kill);
 
+            // drop the reader so we don't lock it until the next job!
+            drop(reader);
+
             if let Either::Left((Err(_), _)) | Either::Right((_, _)) =
                 futures::future::select(next_job, kill).await
             {

diff --git a/crates/holochain/src/core/queue_consumer/publish_dht_ops_consumer.rs b/crates/holochain/src/core/queue_consumer/publish_dht_ops_consumer.rs
@@ -49,6 +49,9 @@ pub fn spawn_publish_dht_ops_consumer(
             tokio::pin!(next_job);
             tokio::pin!(kill);
 
+            // drop the reader so we don't lock it until the next job!
+            drop(reader);
+
             if let Either::Left((Err(_), _)) | Either::Right((_, _)) =
                 futures::future::select(next_job, kill).await
             {

diff --git a/crates/holochain/src/core/queue_consumer/sys_validation_consumer.rs b/crates/holochain/src/core/queue_consumer/sys_validation_consumer.rs
@@ -51,6 +51,9 @@ pub fn spawn_sys_validation_consumer(
             tokio::pin!(next_job);
             tokio::pin!(kill);
 
+            // drop the reader so we don't lock it until the next job!
+            drop(reader);
+
             if let Either::Left((Err(_), _)) | Either::Right((_, _)) =
                 futures::future::select(next_job, kill).await
             {

diff --git a/crates/test_utils/wasm/Cargo.toml b/crates/test_utils/wasm/Cargo.toml
@@ -22,7 +22,3 @@ tokio_safe_block_on = "0.1.2"
 [build-dependencies]
 toml = "0.5"
 walkdir = "2.3.1"
-
-
-[patch.crates-io]
-
diff --git a/crates/test_utils/wasm_common/Cargo.toml b/crates/test_utils/wasm_common/Cargo.toml
@@ -14,6 +14,3 @@ holochain_serialized_bytes = "=0.0.41"
 serde = "=1.0.104"
 serde_bytes = "0.11"
 hdk3 = { path = "../../hdk" }
-
-[patch.crates-io]
-