Fix Tokio Runtime Initialization: Remove Private API Usage and Ensure IO Enabled (#587)

* fix: remove code

* improve code for tokio runtime config

* improve code for main

* fix: add tokio enable_all

* upgrade version

* improve for Cargo.toml

crates/ahm/Cargo.toml

@@ -33,10 +33,10 @@ chrono = { workspace = true }
 rand = { workspace = true }
 reqwest = { workspace = true }
 tempfile = { workspace = true }
-walkdir = "2.5.0"
+walkdir = { workspace = true }
 
 [dev-dependencies]
 serde_json = { workspace = true }
-serial_test = "3.2.0"
+serial_test = { workspace = true }
 tracing-subscriber = { workspace = true }
 tempfile = { workspace = true }

crates/config/src/constants/app.rs

@@ -170,6 +170,11 @@ pub const DEFAULT_LOG_KEEP_FILES: u16 = 30;
 /// Example: --external-address ":9020"
 pub const ENV_EXTERNAL_ADDRESS: &str = "RUSTFS_EXTERNAL_ADDRESS";
 
+/// 1 KiB
+pub const KI_B: usize = 1024;
+/// 1 MiB
+pub const MI_B: usize = 1024 * 1024;
+
 #[cfg(test)]
 mod tests {
     use super::*;

crates/config/src/constants/mod.rs

@@ -15,5 +15,6 @@
 pub(crate) mod app;
 pub(crate) mod console;
 pub(crate) mod env;
+pub(crate) mod runtime;
 pub(crate) mod targets;
 pub(crate) mod tls;

crates/config/src/constants/runtime.rs

@@ -0,0 +1,35 @@
+//  Copyright 2024 RustFS Team
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+use crate::MI_B;
+
+// Tokio runtime ENV keys
+pub const ENV_WORKER_THREADS: &str = "RUSTFS_RUNTIME_WORKER_THREADS";
+pub const ENV_MAX_BLOCKING_THREADS: &str = "RUSTFS_RUNTIME_MAX_BLOCKING_THREADS";
+pub const ENV_THREAD_PRINT_ENABLED: &str = "RUSTFS_RUNTIME_THREAD_PRINT_ENABLED";
+pub const ENV_THREAD_STACK_SIZE: &str = "RUSTFS_RUNTIME_THREAD_STACK_SIZE";
+pub const ENV_THREAD_KEEP_ALIVE: &str = "RUSTFS_RUNTIME_THREAD_KEEP_ALIVE";
+pub const ENV_GLOBAL_QUEUE_INTERVAL: &str = "RUSTFS_RUNTIME_GLOBAL_QUEUE_INTERVAL";
+pub const ENV_THREAD_NAME: &str = "RUSTFS_RUNTIME_THREAD_NAME";
+pub const ENV_RNG_SEED: &str = "RUSTFS_RUNTIME_RNG_SEED";
+
+// Default values for Tokio runtime
+pub const DEFAULT_WORKER_THREADS: usize = 16;
+pub const DEFAULT_MAX_BLOCKING_THREADS: usize = 1024;
+pub const DEFAULT_THREAD_PRINT_ENABLED: bool = false;
+pub const DEFAULT_THREAD_STACK_SIZE: usize = MI_B; // 1 MiB
+pub const DEFAULT_THREAD_KEEP_ALIVE: u64 = 60; // seconds
+pub const DEFAULT_GLOBAL_QUEUE_INTERVAL: u32 = 31;
+pub const DEFAULT_THREAD_NAME: &str = "rustfs-worker";
+pub const DEFAULT_RNG_SEED: Option<u64> = None; // None means random

crates/config/src/lib.rs

@@ -21,6 +21,8 @@ pub use constants::console::*;
 #[cfg(feature = "constants")]
 pub use constants::env::*;
 #[cfg(feature = "constants")]
+pub use constants::runtime::*;
+#[cfg(feature = "constants")]
 pub use constants::targets::*;
 #[cfg(feature = "constants")]
 pub use constants::tls::*;

crates/e2e_test/Cargo.toml

@@ -42,13 +42,11 @@ serial_test = { workspace = true }
 aws-sdk-s3.workspace = true
 aws-config = { workspace = true }
 async-trait = { workspace = true }
-rustfs-kms.workspace = true
 reqwest = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 uuid = { workspace = true }
 base64 = { workspace = true }
-md5 = { workspace = true }
-tempfile = { workspace = true }
 rand = { workspace = true }
-chrono = { workspace = true }
+chrono = { workspace = true }
+md5 = { workspace = true }

crates/kms/Cargo.toml

@@ -31,15 +31,12 @@ workspace = true
 # Core dependencies
 async-trait = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-futures = { workspace = true }
-bytes = { workspace = true }
 uuid = { workspace = true, features = ["serde"] }
 chrono = { workspace = true, features = ["serde"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tracing = { workspace = true }
 thiserror = { workspace = true }
-anyhow = { workspace = true }
 once_cell = { workspace = true }
 
 # Cryptography
@@ -62,15 +59,11 @@ md5 = { workspace = true }
 
 # HTTP client for Vault
 reqwest = { workspace = true }
-vaultrs = { version = "0.7.2" }
-
-# Internal dependencies
-rustfs-crypto = { workspace = true }
+vaultrs = { workspace = true }
 
 [dev-dependencies]
 tokio-test = { workspace = true }
 tempfile = { workspace = true }
-test-case = { workspace = true }
 
 [features]
-default = []
+default = []

crates/targets/src/target/webhook.rs

@@ -128,7 +128,7 @@ where
         // Build HTTP client
         let mut client_builder = Client::builder()
             .timeout(Duration::from_secs(30))
-            .user_agent(rustfs_utils::sys::get_user_agent(rustfs_utils::sys::ServiceType::Basis));
+            .user_agent(rustfs_utils::get_user_agent(rustfs_utils::ServiceType::Basis));
 
         // Supplementary certificate processing logic
         if !args.client_cert.is_empty() && !args.client_key.is_empty() {

crates/utils/src/lib.rs

@@ -77,5 +77,11 @@ mod notify;
 #[cfg(feature = "sys")]
 pub mod sys;
 
+#[cfg(feature = "sys")]
+pub use sys::user_agent::*;
+
+#[cfg(feature = "sys")]
+pub use sys::envs::*;
+
 #[cfg(feature = "notify")]
 pub use notify::*;

crates/utils/src/sys/envs.rs

@@ -0,0 +1,42 @@
+//  Copyright 2024 RustFS Team
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+use std::env;
+
+pub fn get_env_usize(key: &str, default: usize) -> usize {
+    env::var(key).ok().and_then(|v| v.parse().ok()).unwrap_or(default)
+}
+pub fn get_env_u64(key: &str, default: u64) -> u64 {
+    env::var(key).ok().and_then(|v| v.parse().ok()).unwrap_or(default)
+}
+pub fn get_env_u32(key: &str, default: u32) -> u32 {
+    env::var(key).ok().and_then(|v| v.parse().ok()).unwrap_or(default)
+}
+pub fn get_env_str(key: &str, default: &str) -> String {
+    env::var(key).unwrap_or_else(|_| default.to_string())
+}
+pub fn get_env_opt_u64(key: &str) -> Option<u64> {
+    env::var(key).ok().and_then(|v| v.parse().ok())
+}
+
+pub fn get_env_bool(key: &str, default: bool) -> bool {
+    env::var(key)
+        .ok()
+        .and_then(|v| match v.to_lowercase().as_str() {
+            "1" | "true" | "yes" => Some(true),
+            "0" | "false" | "no" => Some(false),
+            _ => None,
+        })
+        .unwrap_or(default)
+}

crates/utils/src/sys/mod.rs

@@ -12,7 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod user_agent;
-
-pub use user_agent::ServiceType;
-pub use user_agent::get_user_agent;
+pub(crate) mod envs;
+pub(crate) mod user_agent;