Upgrade rand crate version and stabalize test rand generation

Upgrades the rand crate version and ensures that every new test gets a new random seed by default.
TraceMachina · Feb 9, 2025 · bedfbca · bedfbca
1 parent a9302dc
commit bedfbca
Show file tree

Hide file tree

Showing 19 changed files with 169 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/nativelink-macro/src/lib.rs b/nativelink-macro/src/lib.rs
@@ -40,6 +40,7 @@ pub fn nativelink_test(attr: TokenStream, item: TokenStream) -> TokenStream {
             #[warn(clippy::disallowed_methods)]
             ::std::sync::Arc::new(::nativelink_util::origin_context::OriginContext::new()).wrap_async(
                 ::nativelink_util::__tracing::trace_span!("test"), async move {
+                    ::nativelink_util::common::reseed_rng_for_test().unwrap();
                     #fn_block
                 }
             )

diff --git a/nativelink-scheduler/Cargo.toml b/nativelink-scheduler/Cargo.toml
@@ -22,7 +22,7 @@ futures = { version = "0.3.31", default-features = false }
 lru = { version = "0.12.5", default-features = false }
 mock_instant = "0.5.2"
 parking_lot = "0.12.3"
-rand = { version = "0.8.5", default-features = false }
+rand = { version = "0.9.0", default-features = false, features = ["thread_rng"] }
 scopeguard = { version = "1.2.0", default-features = false }
 tokio = { version = "1.43.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
 tokio-stream = { version = "0.1.17", features = ["fs"], default-features = false }

diff --git a/nativelink-scheduler/src/grpc_scheduler.rs b/nativelink-scheduler/src/grpc_scheduler.rs
@@ -41,7 +41,6 @@ use nativelink_util::origin_event::OriginMetadata;
 use nativelink_util::retry::{Retrier, RetryResult};
 use nativelink_util::{background_spawn, tls_utils};
 use parking_lot::Mutex;
-use rand::rngs::OsRng;
 use rand::Rng;
 use tokio::select;
 use tokio::sync::watch;
@@ -107,7 +106,7 @@ impl GrpcScheduler {
                 }
                 let min = 1. - (jitter_amt / 2.);
                 let max = 1. + (jitter_amt / 2.);
-                delay.mul_f32(OsRng.gen_range(min..max))
+                delay.mul_f32(rand::rng().random_range(min..max))
             }),
         )
     }

diff --git a/nativelink-service/Cargo.toml b/nativelink-service/Cargo.toml
@@ -16,7 +16,7 @@ futures = { version = "0.3.31", default-features = false }
 http-body = "1.0.1"
 http-body-util = "0.1.2"
 hyper = { version = "1.5.2" }
-rand = { version = "0.8.5", default-features = false }
+rand = { version = "0.9.0", default-features = false, features = ["thread_rng"] }
 serde_json5 = "0.1.0"
 parking_lot = "0.12.3"
 prost = { version = "0.13.4", default-features = false }

diff --git a/nativelink-service/src/worker_api_server.rs b/nativelink-service/src/worker_api_server.rs
@@ -58,9 +58,8 @@ impl WorkerApiServer {
         schedulers: &HashMap<String, Arc<dyn WorkerScheduler>>,
     ) -> Result<Self, Error> {
         let node_id = {
-            let mut rng = rand::thread_rng();
             let mut out = [0; 6];
-            rng.fill_bytes(&mut out);
+            rand::rng().fill_bytes(&mut out);
             out
         };
         for scheduler in schedulers.values() {

diff --git a/nativelink-store/Cargo.toml b/nativelink-store/Cargo.toml
@@ -53,7 +53,7 @@ hyper-rustls = { version = "0.24.2", default-features = false, features = [
 lz4_flex = { version = "0.11.3", default-features = false }
 parking_lot = "0.12.3"
 prost = { version = "0.13.4", default-features = false }
-rand = { version = "0.8.5", default-features = false }
+rand = { version = "0.9.0", default-features = false, features = ["thread_rng"] }
 serde = { version = "1.0.217", default-features = false }
 tokio = { version = "1.43.0", features = ["fs", "rt-multi-thread", "signal", "io-util"], default-features = false }
 tokio-stream = { version = "0.1.17", features = ["fs"], default-features = false }
@@ -78,6 +78,7 @@ aws-sdk-s3 = { version = "=1.68.0", features = [
   "rt-tokio",
 ], default-features = false }
 aws-smithy-runtime-api = "1.7.3"
+rand = { version = "0.9.0", default-features = false, features = ["thread_rng", "small_rng"] }
 serde_json = "1.0.135"
 fred = { version = "10.0.3", default-features = false, features = ["mocks"] }
 tracing-subscriber = { version = "0.3.19", default-features = false }
diff --git a/nativelink-store/src/grpc_store.rs b/nativelink-store/src/grpc_store.rs
@@ -51,7 +51,6 @@ use nativelink_util::store_trait::{StoreDriver, StoreKey, UploadSizeInfo};
 use nativelink_util::{default_health_status_indicator, tls_utils};
 use parking_lot::Mutex;
 use prost::Message;
-use rand::rngs::OsRng;
 use rand::Rng;
 use tokio::time::sleep;
 use tonic::{IntoRequest, Request, Response, Status, Streaming};
@@ -81,7 +80,7 @@ impl GrpcStore {
                 }
                 let min = 1. - (jitter_amt / 2.);
                 let max = 1. + (jitter_amt / 2.);
-                delay.mul_f32(OsRng.gen_range(min..max))
+                delay.mul_f32(rand::rng().random_range(min..max))
             }),
         )
         .await

diff --git a/nativelink-store/src/s3_store.rs b/nativelink-store/src/s3_store.rs
@@ -55,7 +55,6 @@ use nativelink_util::health_utils::{HealthStatus, HealthStatusIndicator};
 use nativelink_util::instant_wrapper::InstantWrapper;
 use nativelink_util::retry::{Retrier, RetryResult};
 use nativelink_util::store_trait::{StoreDriver, StoreKey, UploadSizeInfo};
-use rand::rngs::OsRng;
 use rand::Rng;
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio::net::TcpStream;
@@ -266,7 +265,7 @@ where
             }
             let min = 1. - (jitter_amt / 2.);
             let max = 1. + (jitter_amt / 2.);
-            delay.mul_f32(OsRng.gen_range(min..max))
+            delay.mul_f32(rand::rng().random_range(min..max))
         });
         let s3_client = {
             let http_client =