Merge pull request #2889 from subspace/prevent-executor-stalling-duri…

…ng-plotting Prevent executor stalling during plotting
autonomys · Jul 3, 2024 · 95b4183 · 95b4183
2 parents 0d990c2 + 8a14453
commit 95b4183
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/crates/subspace-farmer/src/plotter/cpu.rs b/crates/subspace-farmer/src/plotter/cpu.rs
@@ -327,26 +327,24 @@ where
                     let thread_pools = plotting_thread_pool_manager.get_thread_pools().await;
 
                     let plotting_fn = || {
-                        tokio::task::block_in_place(|| {
-                            let mut sector = Vec::new();
-
-                            let plotted_sector = encode_sector::<PosTable>(
-                                downloaded_sector,
-                                EncodeSectorOptions {
-                                    sector_index,
-                                    erasure_coding: &erasure_coding,
-                                    pieces_in_sector,
-                                    sector_output: &mut sector,
-                                    table_generators: &mut (0..record_encoding_concurrency.get())
-                                        .map(|_| PosTable::generator())
-                                        .collect::<Vec<_>>(),
-                                    abort_early: &abort_early,
-                                    global_mutex: &global_mutex,
-                                },
-                            )?;
-
-                            Ok((sector, plotted_sector))
-                        })
+                        let mut sector = Vec::new();
+
+                        let plotted_sector = encode_sector::<PosTable>(
+                            downloaded_sector,
+                            EncodeSectorOptions {
+                                sector_index,
+                                erasure_coding: &erasure_coding,
+                                pieces_in_sector,
+                                sector_output: &mut sector,
+                                table_generators: &mut (0..record_encoding_concurrency.get())
+                                    .map(|_| PosTable::generator())
+                                    .collect::<Vec<_>>(),
+                                abort_early: &abort_early,
+                                global_mutex: &global_mutex,
+                            },
+                        )?;
+
+                        Ok((sector, plotted_sector))
                     };
 
                     let thread_pool = if replotting {
@@ -370,7 +368,8 @@ where
 
                     let encoding_start = Instant::now();
 
-                    let plotting_result = thread_pool.install(plotting_fn);
+                    let plotting_result =
+                        tokio::task::block_in_place(|| thread_pool.install(plotting_fn));
 
                     match plotting_result {
                         Ok(plotting_result) => {

diff --git a/crates/subspace-farmer/src/single_disk_farm/plot_cache/tests.rs b/crates/subspace-farmer/src/single_disk_farm/plot_cache/tests.rs
@@ -21,7 +21,7 @@ use tempfile::tempdir;
 const FAKE_SECTOR_SIZE: usize = 2 * 1024 * 1024;
 const TARGET_SECTOR_COUNT: SectorIndex = 5;
 
-#[tokio::test]
+#[tokio::test(flavor = "multi_thread")]
 async fn basic() {
     let dummy_sector_metadata = SectorMetadataChecksummed::from(SectorMetadata {
         sector_index: 0,