From 1bd161a306826bd3b03737c346a9d8ad92fec01b Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Fri, 27 Mar 2026 18:10:25 +0000 Subject: [PATCH] fix(deps): Update to rocksdb v10.10.1, jemalloc 0.6.1 Re-adds revert to try and fix rocksdb repair deadlock --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 8 ++++---- src/database/engine/cf_opts.rs | 16 +++++++++------- src/database/engine/db_opts.rs | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55e20bef1..0b55b889c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4591,8 +4591,8 @@ dependencies = [ [[package]] name = "rust-librocksdb-sys" -version = "0.39.0+10.5.1" -source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=61d9d23872197e9ace4a477f2617d5c9f50ecb23#61d9d23872197e9ace4a477f2617d5c9f50ecb23" +version = "0.42.0+10.10.1" +source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=31fb8f772c7afcdc0061ab6a40cfa3a1be2fccd9#31fb8f772c7afcdc0061ab6a40cfa3a1be2fccd9" dependencies = [ "bindgen", "bzip2-sys", @@ -4608,8 +4608,8 @@ dependencies = [ [[package]] name = "rust-rocksdb" -version = "0.43.0" -source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=61d9d23872197e9ace4a477f2617d5c9f50ecb23#61d9d23872197e9ace4a477f2617d5c9f50ecb23" +version = "0.46.0" +source = "git+https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1?rev=31fb8f772c7afcdc0061ab6a40cfa3a1be2fccd9#31fb8f772c7afcdc0061ab6a40cfa3a1be2fccd9" dependencies = [ "libc", "parking_lot", @@ -5455,8 +5455,8 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.6.0" -source = "git+https://forgejo.ellis.link/continuwuation/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +version = "0.6.1" +source = "git+https://forgejo.ellis.link/continuwuation/jemallocator?rev=df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554#df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" dependencies = [ "libc", "paste", @@ -5465,8 +5465,8 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "git+https://forgejo.ellis.link/continuwuation/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +version = "0.6.1+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +source = "git+https://forgejo.ellis.link/continuwuation/jemallocator?rev=df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554#df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" dependencies = [ "cc", "libc", @@ -5474,8 +5474,8 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.6.0" -source = "git+https://forgejo.ellis.link/continuwuation/jemallocator?rev=82af58d6a13ddd5dcdc7d4e91eae3b63292995b8#82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +version = "0.6.1" +source = "git+https://forgejo.ellis.link/continuwuation/jemallocator?rev=df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554#df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" dependencies = [ "libc", "tikv-jemalloc-sys", diff --git a/Cargo.toml b/Cargo.toml index 8217542a2..b9ca5acd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -388,7 +388,7 @@ features = [ [workspace.dependencies.rust-rocksdb] git = "https://forgejo.ellis.link/continuwuation/rust-rocksdb-zaidoon1" -rev = "61d9d23872197e9ace4a477f2617d5c9f50ecb23" +rev = "31fb8f772c7afcdc0061ab6a40cfa3a1be2fccd9" default-features = false features = [ "multi-threaded-cf", @@ -451,7 +451,7 @@ version = "0.46.0" # jemalloc usage [workspace.dependencies.tikv-jemalloc-sys] git = "https://forgejo.ellis.link/continuwuation/jemallocator" -rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" default-features = false features = [ "background_threads_runtime_support", @@ -459,7 +459,7 @@ features = [ ] [workspace.dependencies.tikv-jemallocator] git = "https://forgejo.ellis.link/continuwuation/jemallocator" -rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" default-features = false features = [ "background_threads_runtime_support", @@ -467,7 +467,7 @@ features = [ ] [workspace.dependencies.tikv-jemalloc-ctl] git = "https://forgejo.ellis.link/continuwuation/jemallocator" -rev = "82af58d6a13ddd5dcdc7d4e91eae3b63292995b8" +rev = "df86ff89d4b1e223b9f7d2dd2fbb7f202da7f554" default-features = false features = ["use_std"] diff --git a/src/database/engine/cf_opts.rs b/src/database/engine/cf_opts.rs index 58358f025..3e404d0db 100644 --- a/src/database/engine/cf_opts.rs +++ b/src/database/engine/cf_opts.rs @@ -70,15 +70,17 @@ fn descriptor_cf_options( ); } - opts.set_options_from_string("{{arena_block_size=2097152;}}") + let mut opts = opts + .get_options_from_string("{{arena_block_size=2097152;}}") .map_err(map_err)?; #[cfg(debug_assertions)] - opts.set_options_from_string( - "{{paranoid_checks=true;paranoid_file_checks=true;force_consistency_checks=true;\ - verify_sst_unique_id_in_manifest=true;}}", - ) - .map_err(map_err)?; + let opts = opts + .get_options_from_string( + "{{paranoid_checks=true;paranoid_file_checks=true;force_consistency_checks=true;\ + verify_sst_unique_id_in_manifest=true;}}", + ) + .map_err(map_err)?; Ok(opts) } @@ -105,7 +107,7 @@ fn set_table_options(opts: &mut Options, desc: &Descriptor, cache: Option<&Cache prepopulate, ); - opts.set_options_from_string(&string).map_err(map_err)?; + let mut opts = opts.get_options_from_string(&string).map_err(map_err)?; opts.set_block_based_table_factory(&table); diff --git a/src/database/engine/db_opts.rs b/src/database/engine/db_opts.rs index d6092cbf2..93cf3c3a4 100644 --- a/src/database/engine/db_opts.rs +++ b/src/database/engine/db_opts.rs @@ -138,7 +138,7 @@ fn set_logging_defaults(opts: &mut Options, config: &Config) { if config.rocksdb_log_stderr { opts.set_stderr_logger(rocksdb_log_level, "rocksdb"); } else { - opts.set_callback_logger(rocksdb_log_level, &handle_log); + opts.set_callback_logger(rocksdb_log_level, handle_log); } }