Skip to content

Commit

Permalink
Introduce SnapshotRepository and object store integration (#2310)
Browse files Browse the repository at this point in the history
  • Loading branch information
pcholakov authored Dec 6, 2024
1 parent 7a62c27 commit 1cdb6f8
Show file tree
Hide file tree
Showing 20 changed files with 978 additions and 111 deletions.
127 changes: 94 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ assert2 = "0.3.11"
async-channel = "2.1.1"
async-trait = "0.1.73"
axum = { version = "0.7.5", default-features = false }
aws-config = "1.5.10"
aws-credential-types = "1.2.1"
base64 = "0.22"
bitflags = { version = "2.6.0" }
bytes = { version = "1.7", features = ["serde"] }
Expand All @@ -102,7 +104,6 @@ datafusion = { version = "42.0.0", default-features = false, features = [
"regex_expressions",
"unicode_expressions",
] }
object_store = { version = "0.11.1"}
datafusion-expr = { version = "42.0.0" }
derive_builder = "0.20.0"
derive_more = { version = "1", features = ["full"] }
Expand Down Expand Up @@ -139,6 +140,7 @@ metrics-exporter-prometheus = { version = "0.15", default-features = false, feat
"async-runtime",
] }
moka = "0.12.5"
object_store = { version = "0.11.1", features = ["aws"] }
once_cell = "1.18"
opentelemetry = { version = "0.24.0" }
opentelemetry-http = { version = "0.13.0" }
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ arc-swap = { workspace = true }
futures = { workspace = true }
futures-util = { workspace = true }
http = { workspace = true }
pprof = { version = "0.13", features = ["criterion", "flamegraph"] }
pprof = { version = "0.14", features = ["criterion", "flamegraph"] }
reqwest = { workspace = true }
rlimit = { workspace = true }
serde_json = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/admin/src/cluster_controller/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ where
) -> anyhow::Result<SnapshotId> {
// todo(pavel): make snapshot RPC timeout configurable, especially if this includes remote upload in the future
let response = tokio::time::timeout(
Duration::from_secs(30),
Duration::from_secs(90),
self.create_snapshot_router.call(
&self.network_sender,
node_id,
Expand Down
Loading

0 comments on commit 1cdb6f8

Please sign in to comment.