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

Jump to bottom

Prepare 0.63.3 point release #3469

Merged
merged 3 commits into from
Dec 4, 2023
Merged

Prepare 0.63.3 point release #3469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cb51ae
fix(metrics): rename grafana metrics to catch up
conorsch Nov 14, 2023
079f1d0
Update Grafana dashboards
voteblake Nov 21, 2023
319c9b4
Try restoring SQLite pragmas (#3338)
hdevalence Dec 1, 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
10 changes: 9 additions & 1 deletion crates/view/src/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,20 @@ impl Storage {
OpenFlags::default() & !OpenFlags::SQLITE_OPEN_URI,
)
.with_init(|conn| {
// "NORMAL" will be consistent, but maybe not durable -- this is fine,
// since all our data is being synced from the chain, so if we lose a dbtx,
// it's like we're resuming sync from a previous height.
conn.execute_batch("PRAGMA journal_mode=WAL; PRAGMA synchronous=NORMAL;")?;
// We use `prepare_cached` a fair amount: this is an overestimate of the number
// of cached prepared statements likely to be used.
conn.set_prepared_statement_cache_capacity(32);
Ok(())
});
Ok(r2d2::Pool::new(manager)?)
Ok(r2d2::Pool::builder()
// We set max_size=1 to avoid "database is locked" sqlite errors,
// when accessing across multiple threads.
.max_size(1)
.build(manager)?)
} else {
let manager = SqliteConnectionManager::memory();
// Max size needs to be set to 1, otherwise a new in-memory database is created for each
Expand Down
12 changes: 6 additions & 6 deletions deployments/config/grafana/dashboards/ABCI.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"expr": "sum(rate(tendermint_abci_connection_method_timing_count[5m])) by (method)",
"expr": "sum(rate(tendermint_abci_connection_method_timing_seconds_count[5m])) by (method)",
"refId": "A"
}
],
Expand Down Expand Up @@ -255,7 +255,7 @@
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_bucket{method=\"begin_block\"}[5m])))",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_seconds_bucket{method=\"begin_block\"}[5m])))",
"range": true,
"refId": "A"
},
Expand All @@ -264,7 +264,7 @@
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"expr": "histogram_quantile(0.5, sum by(le) (rate(tendermint_abci_connection_method_timing_bucket{method=\"begin_block\"}[5m])))",
"expr": "histogram_quantile(0.5, sum by(le) (rate(tendermint_abci_connection_method_timing_seconds_bucket{method=\"begin_block\"}[5m])))",
"hide": false,
"refId": "B"
}
Expand Down Expand Up @@ -353,7 +353,7 @@
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_bucket{method=\"deliver_tx\"}[5m])))",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_seconds_bucket{method=\"deliver_tx\"}[5m])))",
"range": true,
"refId": "A"
}
Expand Down Expand Up @@ -442,7 +442,7 @@
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_bucket{method=\"end_block\"}[5m])))",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_seconds_bucket{method=\"end_block\"}[5m])))",
"range": true,
"refId": "A"
}
Expand Down Expand Up @@ -531,7 +531,7 @@
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_bucket{method=\"commit\"}[5m])))",
"expr": "histogram_quantile(0.95, sum by(le) (rate(tendermint_abci_connection_method_timing_seconds_bucket{method=\"commit\"}[5m])))",
"range": true,
"refId": "A"
}
Expand Down
6 changes: 3 additions & 3 deletions deployments/config/grafana/dashboards/Client Info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "rate(penumbra_pd_oblivious_client_compact_block_served_total[5m])",
"expr": "rate(penumbra_component_compact_block_compact_block_range_served_total[5m])",
"legendFormat": "Rate of served compact blocks (5m)",
"range": true,
"refId": "A"
Expand All @@ -150,7 +150,7 @@
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "rate(penumbra_pd_oblivious_client_compact_block_served_total[30s])",
"expr": "rate(penumbra_component_compact_block_compact_block_range_served_total[30s])",
"hide": false,
"legendFormat": "Rate of served compact blocks (30s)",
"range": true,
Expand Down Expand Up @@ -240,7 +240,7 @@
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"expr": "penumbra_pd_oblivious_client_compact_active_connections",
"expr": "penumbra_component_compact_block_compact_block_range_active_connections",
"refId": "A"
}
],
Expand Down
196 changes: 15 additions & 181 deletions deployments/config/grafana/dashboards/Penumbra.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${DS_PROMETHEUS}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -108,7 +108,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "rate(penumbra_storage_get_raw_duration_seconds_sum[5m]) / rate(penumbra_storage_get_raw_duration_seconds_count[5m])",
Expand All @@ -123,7 +123,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${DS_PROMETHEUS}"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -201,7 +201,7 @@
{
"datasource": {
"type": "prometheus",
"uid": "PBFA97CFB590B2093"
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "rate(penumbra_storage_nonverifiable_get_raw_duration_seconds_sum[5m]) / rate(penumbra_storage_nonverifiable_get_raw_duration_seconds_count[5m])",
Expand Down Expand Up @@ -499,172 +499,6 @@
"title": "Serialized TCT Size",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "palette-classic"
},
"custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
"showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
"mode": "none"
},
"thresholdsStyle": {
"mode": "off"
}
},
"mappings": [],
"min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": [
{
"__systemRef": "hideSeriesFrom",
"matcher": {
"id": "byNames",
"options": {
"mode": "exclude",
"names": [
"Active Validators"
],
"prefix": "All except:",
"readOnly": true
}
},
"properties": [
{
"id": "custom.hideFrom",
"value": {
"legend": false,
"tooltip": false,
"viz": true
}
}
]
}
]
},
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 32
},
"id": 6,
"options": {
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
"mode": "single",
"sort": "none"
}
},
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "group(penumbra_stake_validators_active{worker=\"\\\"consensus\\\"\"}) by (worker)",
"interval": "",
"legendFormat": "Active Validators",
"refId": "A"
},
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "group(penumbra_stake_validators_inactive{worker=\"\\\"consensus\\\"\"}) by (worker)",
"hide": false,
"interval": "",
"legendFormat": "Inactive Validators",
"refId": "B"
},
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "group(penumbra_stake_validators_disabled{worker=\"\\\"consensus\\\"\"}) by (worker)",
"hide": false,
"interval": "",
"legendFormat": "Disabled Validators",
"refId": "C"
},
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "group(penumbra_stake_validators_jailed{worker=\"\\\"consensus\\\"\"}) by (worker)",
"hide": false,
"interval": "",
"legendFormat": "Jailed Validators",
"refId": "D"
},
{
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "group(penumbra_stake_validators_tombstoned{worker=\"\\\"consensus\\\"\"}) by (worker)",
"hide": false,
"interval": "",
"legendFormat": "Tombstoned Validators",
"refId": "E"
}
],
"title": "Validators",
"type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
Expand Down Expand Up @@ -725,8 +559,8 @@
"gridPos": {
"h": 8,
"w": 12,
"x": 0,
"y": 41
"x": 12,
"y": 16
},
"id": 4,
"options": {
Expand Down Expand Up @@ -817,9 +651,9 @@
},
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 49
"w": 12,
"x": 12,
"y": 8
},
"id": 2,
"options": {
Expand All @@ -841,7 +675,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum(penumbra_stake_validators_active{worker=\"\\\"consensus\\\"\"})",
"expr": "sum(penumbra_stake_validators_active)",
"interval": "",
"legendFormat": "Active Validators",
"refId": "A"
Expand All @@ -852,7 +686,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum(penumbra_stake_validators_inactive{worker=\"\\\"consensus\\\"\"})",
"expr": "sum(penumbra_stake_validators_inactive)",
"hide": false,
"interval": "",
"legendFormat": "Inactive Validators",
Expand All @@ -864,7 +698,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum(penumbra_stake_validators_disabled{worker=\"\\\"consensus\\\"\"})",
"expr": "sum(penumbra_stake_validators_disabled)",
"hide": false,
"interval": "",
"legendFormat": "Disabled Validators",
Expand All @@ -876,10 +710,10 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum(penumbra_stake_validators_tombstoned{worker=\"\\\"consensus\\\"\"})",
"expr": "sum(penumbra_stake_validators_tombstoned)",
"hide": false,
"interval": "",
"legendFormat": "",
"legendFormat": "Tombstoned Validators",
"refId": "D"
},
{
Expand All @@ -888,7 +722,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum(penumbra_stake_validators_jailed{worker=\"\\\"consensus\\\"\"})",
"expr": "sum(penumbra_stake_validators_jailed)",
"hide": false,
"interval": "",
"legendFormat": "Jailed Validators",
Expand Down
Loading
Loading