Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: consumption metrics on restart #5323

Merged
merged 12 commits into from
Sep 16, 2023
Merged

fix: consumption metrics on restart #5323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0a87599
feat: file-backed cached metrics
koivunej Sep 13, 2023
36c8c7b
refactor: two line tenant snapshot usage
koivunej Sep 14, 2023
e8def1e
test: introduce tests for new metrics
koivunej Sep 14, 2023
3fec15b
test_metric_collection: calculate synthetic size faster
koivunej Sep 14, 2023
2333b61
test_metric_collection: stateful object verifiers
koivunej Sep 14, 2023
c1bcae5
test_metric_collection: spice up with a restart
koivunej Sep 14, 2023
3b3bfc4
test_metric_collection: assert synthetic_storage_size
koivunej Sep 14, 2023
4c367d6
test_metric_collection: a bit more work
koivunej Sep 14, 2023
895ac06
chore: pyfmt
koivunej Sep 14, 2023
1579f69
test_metric_collection: another pass
koivunej Sep 14, 2023
3e97ee7
chore: mypy (backport)
koivunej Sep 15, 2023
875e219
chore: clippies
koivunej Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/consumption_metrics/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use chrono::{DateTime, Utc};
use rand::Rng;
use serde::Serialize;

#[derive(Serialize, Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd)]
#[derive(Serialize, serde::Deserialize, Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd)]
#[serde(tag = "type")]
pub enum EventType {
#[serde(rename = "absolute")]
Expand Down
2 changes: 1 addition & 1 deletion pageserver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ enum-map.workspace = true
enumset.workspace = true
strum.workspace = true
strum_macros.workspace = true
tempfile.workspace = true

[dev-dependencies]
criterion.workspace = true
hex-literal.workspace = true
tempfile.workspace = true
tokio = { workspace = true, features = ["process", "sync", "fs", "rt", "io-util", "time", "test-util"] }

[[bench]]
Expand Down
4 changes: 4 additions & 0 deletions pageserver/src/bin/pageserver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,9 @@ fn start_pageserver(
// creates a child context with the right DownloadBehavior.
DownloadBehavior::Error,
);

let local_disk_storage = conf.workdir.join("last_consumption_metrics.json");

task_mgr::spawn(
crate::BACKGROUND_RUNTIME.handle(),
TaskKind::MetricsCollection,
Expand All @@ -544,6 +547,7 @@ fn start_pageserver(
conf.cached_metric_collection_interval,
conf.synthetic_size_calculation_interval,
conf.id,
local_disk_storage,
metrics_ctx,
)
.instrument(info_span!("metrics_collection"))
Expand Down
Loading