maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/[ca]store): Add logging support to redb

Browse source 
We wanted to enable this earlier but the log level of many of the
messages in redb were too high, they've now been downgraded, so we can
enable logs from redb.

Context on the fix and release:
 - https://github.com/cberner/redb/pull/828
 - https://github.com/cberner/redb/releases/tag/v2.1.2

Change-Id: I8635e8a0bcb01a7d0b580387ac9134ccdd0205f3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12568
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
Ilan Joselevich 2024-10-03 20:02:22 +02:00 • committed by clbot
parent 0ef1b9bc6a
commit 7fedfe1cde
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tvix/Cargo.lock generated
View file

@ -3181,6 +3181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58323dc32ea52a8ae105ff94bc0460c5d906307533ba3401aa63db3cbe491fe5" checksum = "58323dc32ea52a8ae105ff94bc0460c5d906307533ba3401aa63db3cbe491fe5"
dependencies = [ dependencies = [
"libc", "libc",
"log",
] ]
[[package]] [[package]]

8
tvix/Cargo.nix
View file

@ -10063,6 +10063,11 @@ rec {
packageId = "libc"; packageId = "libc";
target = { target, features }: (target."unix" or false); target = { target, features }: (target."unix" or false);
} }
{
name = "log";
packageId = "log";
optional = true;
}
]; ];
devDependencies = [ devDependencies = [
{ {
@ -10075,6 +10080,7 @@ rec {
"logging" = [ "dep:log" ]; "logging" = [ "dep:log" ];
"python" = [ "dep:pyo3" "dep:pyo3-build-config" ]; "python" = [ "dep:pyo3" "dep:pyo3-build-config" ];
}; };
resolvedDefaultFeatures = [ "logging" ];
}; };
"redox_syscall 0.3.5" = rec { "redox_syscall 0.3.5" = rec {
crateName = "redox_syscall"; crateName = "redox_syscall";
@ -15219,6 +15225,7 @@ rec {
{ {
name = "redb"; name = "redb";
packageId = "redb"; packageId = "redb";
features = [ "logging" ];
} }
{ {
name = "serde"; name = "serde";
@ -16010,6 +16017,7 @@ rec {
{ {
name = "redb"; name = "redb";
packageId = "redb"; packageId = "redb";
features = [ "logging" ];
} }
{ {
name = "reqwest"; name = "reqwest";

2
tvix/castore/Cargo.toml
View file

@ -40,7 +40,7 @@ pin-project = { workspace = true }
erased-serde = { workspace = true } erased-serde = { workspace = true }
serde_tagged = { workspace = true } serde_tagged = { workspace = true }
hyper-util = { workspace = true } hyper-util = { workspace = true }
redb = { workspace = true } redb = { workspace = true, features = ["logging"] }
bigtable_rs = { workspace = true, optional = true } bigtable_rs = { workspace = true, optional = true }
fuse-backend-rs = { workspace = true, optional = true } fuse-backend-rs = { workspace = true, optional = true }
libc = { workspace = true, optional = true } libc = { workspace = true, optional = true }

2
tvix/store/Cargo.toml
View file

@ -46,7 +46,7 @@ tracing-indicatif = { workspace = true }
hyper-util = { workspace = true } hyper-util = { workspace = true }
toml = { version = "0.8.19", optional = true } toml = { version = "0.8.19", optional = true }
tonic-health = { workspace = true } tonic-health = { workspace = true }
redb = { workspace = true } redb = { workspace = true, features = ["logging"] }
mimalloc = { workspace = true } mimalloc = { workspace = true }
tonic-reflection = { workspace = true, optional = true } tonic-reflection = { workspace = true, optional = true }
bigtable_rs = { workspace = true, optional = true } bigtable_rs = { workspace = true, optional = true }