Repository navigation
fix(obsv): wire live per-database metrics sampler (fixes #386) #386
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
42aa161
23e8899
1155e96
6f453ae
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ use crate::error::{MemError, Result}; | |
| use crate::over_release::ReleaseIdentity; | ||
| use crate::reservation_token::{ReservationParams, ReservationToken}; | ||
| use crate::reserve_scope::{ReserveScope, ReservedLayers}; | ||
| use crate::scoped_budget::ScopedBudget; | ||
|
|
||
| /// Build the token both entry points return. They differ in how they reach | ||
| /// a committed [`ReservedLayers`], never in what they build from one. | ||
|
|
@@ -62,21 +63,34 @@ impl MemoryGovernor { | |
| scope.try_credit_global()?; | ||
|
|
||
| { | ||
| let map = self | ||
| .database_budgets | ||
| .read() | ||
| .unwrap_or_else(|p| p.into_inner()); | ||
| if let Some(budget) = map.get(&db) { | ||
| match budget.try_reserve(size) { | ||
| Ok(arc) => scope.credit_database(arc), | ||
| Err(denied) => { | ||
| return Err(MemError::DatabaseBudgetExhausted { | ||
| db, | ||
| requested: size, | ||
| available: budget.available(), | ||
| limit: denied.limit, | ||
| }); | ||
| } | ||
| let budget = { | ||
| let map = self | ||
| .database_budgets | ||
| .read() | ||
| .unwrap_or_else(|p| p.into_inner()); | ||
| map.get(&db).cloned() | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The read lock is now released before Hold the read lock across |
||
| }; | ||
| let budget = match budget { | ||
| Some(b) => b, | ||
| None => { | ||
| let mut map = self | ||
| .database_budgets | ||
| .write() | ||
| .unwrap_or_else(|p| p.into_inner()); | ||
| map.entry(db) | ||
| .or_insert_with(|| ScopedBudget::new(None)) | ||
| .clone() | ||
| } | ||
| }; | ||
| match budget.try_reserve(size) { | ||
| Ok(arc) => scope.credit_database(arc), | ||
| Err(denied) => { | ||
| return Err(MemError::DatabaseBudgetExhausted { | ||
| db, | ||
| requested: size, | ||
| available: budget.available(), | ||
| limit: denied.limit, | ||
| }); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -138,13 +152,26 @@ impl MemoryGovernor { | |
| scope.credit_global_unchecked(); | ||
|
|
||
| { | ||
| let map = self | ||
| .database_budgets | ||
| .read() | ||
| .unwrap_or_else(|p| p.into_inner()); | ||
| if let Some(budget) = map.get(&db) { | ||
| scope.credit_database(budget.credit(size)); | ||
| } | ||
| let budget = { | ||
| let map = self | ||
| .database_budgets | ||
| .read() | ||
| .unwrap_or_else(|p| p.into_inner()); | ||
| map.get(&db).cloned() | ||
| }; | ||
| let budget = match budget { | ||
| Some(b) => b, | ||
| None => { | ||
| let mut map = self | ||
| .database_budgets | ||
| .write() | ||
| .unwrap_or_else(|p| p.into_inner()); | ||
| map.entry(db) | ||
| .or_insert_with(|| ScopedBudget::new(None)) | ||
| .clone() | ||
| } | ||
| }; | ||
| scope.credit_database(budget.credit(size)); | ||
| } | ||
|
|
||
| { | ||
|
|
@@ -493,4 +520,33 @@ mod tests { | |
| tok.err() | ||
| ); | ||
| } | ||
|
|
||
| #[test] | ||
| fn uncapped_database_usage_tracks_allocation() { | ||
| let gov = MemoryGovernor::new(test_config()).unwrap(); | ||
| assert_eq!(gov.database_usage_bytes(db()), 0); | ||
|
|
||
| let tok = gov | ||
| .try_reserve(db(), tenant(), EngineId::Vector, 512) | ||
| .unwrap(); | ||
| assert_eq!(gov.database_usage_bytes(db()), 512); | ||
|
|
||
| drop(tok); | ||
| assert_eq!(gov.database_usage_bytes(db()), 0); | ||
| } | ||
|
|
||
| #[test] | ||
| fn unbudgeted_database_tracks_8192_bytes_and_releases_on_drop() { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is |
||
| let gov = MemoryGovernor::new(test_config()).unwrap(); | ||
| let unbudgeted_db = DatabaseId::new(42); | ||
| assert_eq!(gov.database_usage_bytes(unbudgeted_db), 0); | ||
|
|
||
| let token = gov | ||
| .try_reserve(unbudgeted_db, tenant(), EngineId::Vector, 8192) | ||
| .unwrap(); | ||
| assert_eq!(gov.database_usage_bytes(unbudgeted_db), 8192); | ||
|
|
||
| drop(token); | ||
| assert_eq!(gov.database_usage_bytes(unbudgeted_db), 0); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Blocker.
database_budgetshas an entry only afterALTER DATABASE … SET QUOTA.try_reservecredits a database only when it has a budget.A database with no quota reports 0 bytes forever. The doc line above states this, but the gauge still exports 0 as if it were real.
Track per-database allocation for every database, independent of whether a budget is set.