fixup

Signed-off-by: tison <wander4096@gmail.com>

Author: tisonkun

cmd/percas/src/start.rs

@@ -64,9 +64,11 @@ impl CommandStart {
         }
         log::info!("Percas is starting with loaded config: {config:#?}");
 
+        let io_runtime = make_io_runtime();
         let server_runtime = make_server_runtime();
         let gossip_runtime = make_gossip_runtime();
         server_runtime.block_on(run_server(
+            &io_runtime,
             &server_runtime,
             &gossip_runtime,
             node_id,
@@ -75,6 +77,14 @@ impl CommandStart {
     }
 }
 
+fn make_io_runtime() -> Runtime {
+    percas_core::Builder::new("foyer_io_runtime", "foyer_io_thread")
+        .worker_threads(4)
+        .max_blocking_threads(num_cpus().get() * 2)
+        .build()
+        .unwrap()
+}
+
 fn make_telemetry_runtime() -> Runtime {
     make_runtime("telemetry_runtime", "telemetry_thread", 1)
 }
@@ -89,6 +99,7 @@ fn make_gossip_runtime() -> Runtime {
 }
 
 async fn run_server(
+    io_rt: &Runtime,
     server_rt: &Runtime,
     gossip_rt: &Runtime,
     node_id: Uuid,
@@ -105,6 +116,7 @@ async fn run_server(
     })?;
 
     let engine = FoyerEngine::try_new(
+        io_rt,
         config.storage.data_dir.as_path(),
         config.storage.memory_capacity.into(),
         config.storage.disk_capacity.into(),

crates/core/benches/benchmark.rs

@@ -30,10 +30,14 @@ fn foyer_engine(c: &mut Criterion) {
     let runtime = tokio::runtime::Builder::new_current_thread()
         .build()
         .unwrap();
+
+    let test_rt = percas_core::make_runtime("test_runtime", "test_thread", 2);
+
     {
         let dir = tempdir_in("/tmp").unwrap();
         let engine = runtime.block_on(async {
             FoyerEngine::try_new(
+                &test_rt,
                 dir.path(),
                 ByteSize::default(),
                 ByteSize::gib(4),
@@ -63,6 +67,7 @@ fn foyer_engine(c: &mut Criterion) {
                 let dir = tempdir_in("/tmp").unwrap();
                 let engine = runtime.block_on(async {
                     FoyerEngine::try_new(
+                        &test_rt,
                         dir.path(),
                         ByteSize::default(),
                         ByteSize::gib(4),

crates/core/src/config.rs

@@ -534,17 +534,13 @@ mod tests {
             filter = 'INFO'
             dir = 'logs'
             max_files = 64
-
             [telemetry.logs.stderr]
             filter = 'INFO'
-
             [telemetry.logs.opentelemetry]
             filter = 'INFO'
             otlp_endpoint = 'http://127.0.0.1:4317'
-
             [telemetry.traces]
             capture_log_filter = 'INFO'
-
             [telemetry.traces.opentelemetry]
             otlp_endpoint = 'http://127.0.0.1:4317'
             [telemetry.metrics.opentelemetry]

crates/core/src/engine.rs

@@ -27,14 +27,12 @@ use foyer::HybridCachePolicy;
 use foyer::IoEngineConfig;
 use foyer::IopsCounter;
 use foyer::LfuConfig;
-use foyer::PsyncIoEngineConfig;
 use foyer::RecoverMode;
 use foyer::Spawner;
 use mixtrics::registry::noop::NoopMetricsRegistry;
 use mixtrics::registry::opentelemetry_0_31::OpenTelemetryMetricsRegistry;
 use parse_display::Display;
 
-use crate::Runtime;
 use crate::newtype::DiskThrottle;
 use crate::num_cpus;
 use crate::runtime;
@@ -51,12 +49,11 @@ impl std::error::Error for EngineError {}
 pub struct FoyerEngine {
     inner: HybridCache<Vec<u8>, Vec<u8>>,
     capacity: ByteSize,
-    #[expect(dead_code)]
-    runtime: Runtime,
 }
 
 impl FoyerEngine {
     pub async fn try_new(
+        io_runtime: &runtime::Runtime,
         data_dir: &Path,
         memory_capacity: ByteSize,
         disk_capacity: ByteSize,
@@ -96,8 +93,6 @@ impl FoyerEngine {
             .build()
             .map_err(|err| EngineError(format!("failed to create device: {err}")))?;
 
-        let psync_engine = Box::new(PsyncIoEngineConfig::new());
-
         let io_engine: Box<dyn IoEngineConfig> = {
             #[cfg(target_os = "linux")]
             {
@@ -107,16 +102,11 @@ impl FoyerEngine {
 
             #[cfg(not(target_os = "linux"))]
             {
-                psync_engine
+                use foyer::PsyncIoEngineConfig;
+                Box::new(PsyncIoEngineConfig::new())
             }
         };
 
-        let runtime = runtime::Builder::new("foyer_io_runtime", "foyer_io_thread")
-            .worker_threads(4)
-            .max_blocking_threads(num_cpus().get() * 2)
-            .build()
-            .map_err(|err| EngineError(format!("failed to build foyer IO runtime: {err}")))?;
-
         let parallelism = num_cpus().get();
         let cache = HybridCacheBuilder::new()
             .with_policy(HybridCachePolicy::WriteOnEviction)
@@ -141,15 +131,14 @@ impl FoyerEngine {
             )
             .with_io_engine_config(io_engine)
             .with_recover_mode(RecoverMode::Quiet)
-            .with_spawner(runtime.spawn_blocking(Spawner::current).await)
+            .with_spawner(io_runtime.spawn_blocking(Spawner::current).await)
             .build()
             .await
             .map_err(|err| EngineError(err.to_string()))?;
 
         Ok(FoyerEngine {
             inner: cache,
             capacity: disk_capacity,
-            runtime,
         })
     }
 
@@ -188,25 +177,30 @@ mod tests {
 
     use super::*;
 
-    #[tokio::test]
-    async fn test_get() {
-        let temp_dir = tempfile::tempdir().unwrap();
-
-        let engine = FoyerEngine::try_new(
-            temp_dir.path(),
-            ByteSize::kib(512),
-            ByteSize::mib(1),
-            None,
-            None,
-        )
-        .await
-        .unwrap();
-
-        engine.put(b"foo".to_vec().as_ref(), b"bar".to_vec().as_ref());
-
-        assert_compact_debug_snapshot!(
-            engine.get(b"foo".to_vec().as_ref()).await,
-            @"Some([98, 97, 114])"
-        );
+    #[test]
+    fn test_get() {
+        let runtime = runtime::make_runtime("test_runtime", "test_thread", 2);
+
+        runtime.block_on(async {
+            let temp_dir = tempfile::tempdir().unwrap();
+
+            let engine = FoyerEngine::try_new(
+                &runtime,
+                temp_dir.path(),
+                ByteSize::kib(512),
+                ByteSize::mib(1),
+                None,
+                None,
+            )
+            .await
+            .unwrap();
+
+            engine.put(b"foo".to_vec().as_ref(), b"bar".to_vec().as_ref());
+
+            assert_compact_debug_snapshot!(
+                engine.get(b"foo".to_vec().as_ref()).await,
+                @"Some([98, 97, 114])"
+            );
+        });
     }
 }

tests/src/lib.rs

@@ -91,6 +91,7 @@ fn start_test_server(test_name: &str, rt: &Runtime) -> Option<TestServerState> {
     let (shutdown_tx, shutdown_rx) = mea::shutdown::new_pair();
     let server_state = rt.block_on(async move {
         let engine = FoyerEngine::try_new(
+            rt,
             &config.storage.data_dir,
             config.storage.memory_capacity.into(),
             config.storage.disk_capacity.into(),