diff --git a/Cargo.lock b/Cargo.lock index 3e804ebd697b..d933aabafeb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6990,8 +6990,7 @@ dependencies = [ [[package]] name = "madsim" version = "0.2.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88753ddf8d3cd43b9cf71a93626dd9aad3c24086a04420beb31922e1f856d02" +source = "git+https://github.com/madsim-rs/madsim.git?rev=f0ffd24864245aea236833f1ff3638f75bd51700#f0ffd24864245aea236833f1ff3638f75bd51700" dependencies = [ "ahash 0.8.11", "async-channel 2.2.1", @@ -7059,8 +7058,7 @@ dependencies = [ [[package]] name = "madsim-macros" version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d248e97b1a48826a12c3828d921e8548e714394bf17274dd0a93910dc946e1" +source = "git+https://github.com/madsim-rs/madsim.git?rev=f0ffd24864245aea236833f1ff3638f75bd51700#f0ffd24864245aea236833f1ff3638f75bd51700" dependencies = [ "darling 0.14.4", "proc-macro2", @@ -9516,7 +9514,7 @@ dependencies = [ "indoc", "libc", "memoffset", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "portable-atomic", "pyo3-build-config", "pyo3-ffi", diff --git a/Cargo.toml b/Cargo.toml index ea6cc1195492..0c98ec0db4f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -354,6 +354,7 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = # If we can merge in: https://github.com/madsim-rs/sqlx/pull/2, # we can change it to patch madsim version instead. sqlx = { git = "https://github.com/kwannoel/sqlx.git", rev = "ddf222f56cf99f865231a5383053645c6ea05ba3" } +madsim = { git = "https://github.com/madsim-rs/madsim.git", rev = "f0ffd24864245aea236833f1ff3638f75bd51700" } futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" } # patch to remove preserve_order from serde_json bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" } diff --git a/ci/scripts/deterministic-recovery-test.sh b/ci/scripts/deterministic-recovery-test.sh index 0cf3590ba1cb..b38adfb3a83d 100755 --- a/ci/scripts/deterministic-recovery-test.sh +++ b/ci/scripts/deterministic-recovery-test.sh @@ -44,7 +44,7 @@ filter_stack_trace_for_all_logs() { done } -trap filter_stack_trace_for_all_logs ERR +# trap filter_stack_trace_for_all_logs ERR # NOTE(kwannoel): We must use `export` here, because the variables are not substituted # directly via bash subtitution. Instead, the `parallel` command substitutes the variables