diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-10-03T18·02+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-10-04T16·31+0000 |
| commit | 7fedfe1cde1d1b021c50f3cbd4f620027c85a7ce (patch) | |
| tree | 4ad0929a4ebd567f0790d053d0624f26164fa342 | |
| parent | 0ef1b9bc6a9ad8659e30d2142675eb0824e3c3fe (diff) | |
feat(tvix/[ca]store): Add logging support to redb r/8756
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>
| -rw-r--r-- | tvix/Cargo.lock | 1 | ||||
| -rw-r--r-- | tvix/Cargo.nix | 8 | ||||
| -rw-r--r-- | tvix/castore/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/store/Cargo.toml | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 56e380616466..2aae92b6cdc9 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -3181,6 +3181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58323dc32ea52a8ae105ff94bc0460c5d906307533ba3401aa63db3cbe491fe5" dependencies = [ "libc", + "log", ] [[package]] diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 03ed46549145..3bce8c74afe5 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -10063,6 +10063,11 @@ rec { packageId = "libc"; target = { target, features }: (target."unix" or false); } + { + name = "log"; + packageId = "log"; + optional = true; + } ]; devDependencies = [ { @@ -10075,6 +10080,7 @@ rec { "logging" = [ "dep:log" ]; "python" = [ "dep:pyo3" "dep:pyo3-build-config" ]; }; + resolvedDefaultFeatures = [ "logging" ]; }; "redox_syscall 0.3.5" = rec { crateName = "redox_syscall"; @@ -15219,6 +15225,7 @@ rec { { name = "redb"; packageId = "redb"; + features = [ "logging" ]; } { name = "serde"; @@ -16010,6 +16017,7 @@ rec { { name = "redb"; packageId = "redb"; + features = [ "logging" ]; } { name = "reqwest"; diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index 2a9fa9f142ec..00f4e44e5b70 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -40,7 +40,7 @@ pin-project = { workspace = true } erased-serde = { workspace = true } serde_tagged = { workspace = true } hyper-util = { workspace = true } -redb = { workspace = true } +redb = { workspace = true, features = ["logging"] } bigtable_rs = { workspace = true, optional = true } fuse-backend-rs = { workspace = true, optional = true } libc = { workspace = true, optional = true } diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index 8b043e365b5e..3dc816e4ba74 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -46,7 +46,7 @@ tracing-indicatif = { workspace = true } hyper-util = { workspace = true } toml = { version = "0.8.19", optional = true } tonic-health = { workspace = true } -redb = { workspace = true } +redb = { workspace = true, features = ["logging"] } mimalloc = { workspace = true } tonic-reflection = { workspace = true, optional = true } bigtable_rs = { workspace = true, optional = true } |