Prevent deadlock when create a new meter/price on Stripe (#19196)

This also puts the entire state of `StripeBilling` behind a `RwLock`.
When fetching the existing prices and meters, or when inserting new
ones, we acquire a write lock and hold it until the Stripe request
completes. This prevents two concurrent calls to `get_or_insert_price`
from inserting the same data twice.

Creating a new meter/price is unusual, so in practice we'll acquire a
read lock most of the time.

/cc @rtfeldman @maxdeviant 

Release Notes:

- N/A
This commit is contained in:
Antonio Scandurra 2024-10-14 17:31:51 +02:00 committed by GitHub
parent 6986f081d0
commit 6e2869a321
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -8,11 +8,16 @@ use serde::{Deserialize, Serialize};
use tokio::sync::RwLock; use tokio::sync::RwLock;
pub struct StripeBilling { pub struct StripeBilling {
meters_by_event_name: RwLock<HashMap<String, StripeMeter>>, state: RwLock<StripeBillingState>,
price_ids_by_meter_id: RwLock<HashMap<String, stripe::PriceId>>,
client: Arc<stripe::Client>, client: Arc<stripe::Client>,
} }
#[derive(Default)]
struct StripeBillingState {
meters_by_event_name: HashMap<String, StripeMeter>,
price_ids_by_meter_id: HashMap<String, stripe::PriceId>,
}
pub struct StripeModel { pub struct StripeModel {
input_tokens_price: StripeBillingPrice, input_tokens_price: StripeBillingPrice,
input_cache_creation_tokens_price: StripeBillingPrice, input_cache_creation_tokens_price: StripeBillingPrice,
@ -29,36 +34,36 @@ impl StripeBilling {
pub fn new(client: Arc<stripe::Client>) -> Self { pub fn new(client: Arc<stripe::Client>) -> Self {
Self { Self {
client, client,
meters_by_event_name: RwLock::new(HashMap::default()), state: RwLock::default(),
price_ids_by_meter_id: RwLock::new(HashMap::default()),
} }
} }
pub async fn initialize(&self) -> Result<()> { pub async fn initialize(&self) -> Result<()> {
log::info!("initializing StripeBilling"); log::info!("StripeBilling: initializing");
{ let mut state = self.state.write().await;
let meters = StripeMeter::list(&self.client).await?.data;
let mut meters_by_event_name = self.meters_by_event_name.write().await; let (meters, prices) = futures::try_join!(
for meter in meters { StripeMeter::list(&self.client),
meters_by_event_name.insert(meter.event_name.clone(), meter); stripe::Price::list(&self.client, &stripe::ListPrices::default())
} )?;
for meter in meters.data {
state
.meters_by_event_name
.insert(meter.event_name.clone(), meter);
} }
{ for price in prices.data {
let prices = stripe::Price::list(&self.client, &stripe::ListPrices::default())
.await?
.data;
let mut price_ids_by_meter_id = self.price_ids_by_meter_id.write().await;
for price in prices {
if let Some(recurring) = price.recurring { if let Some(recurring) = price.recurring {
if let Some(meter) = recurring.meter { if let Some(meter) = recurring.meter {
price_ids_by_meter_id.insert(meter, price.id); state.price_ids_by_meter_id.insert(meter, price.id);
}
} }
} }
} }
log::info!("StripeBilling: initialized");
Ok(()) Ok(())
} }
@ -105,8 +110,21 @@ impl StripeBilling {
price_description: &str, price_description: &str,
price_per_million_tokens: Cents, price_per_million_tokens: Cents,
) -> Result<StripeBillingPrice> { ) -> Result<StripeBillingPrice> {
let meter = // Fast code path when the meter and the price already exist.
if let Some(meter) = self.meters_by_event_name.read().await.get(meter_event_name) { {
let state = self.state.read().await;
if let Some(meter) = state.meters_by_event_name.get(meter_event_name) {
if let Some(price_id) = state.price_ids_by_meter_id.get(&meter.id) {
return Ok(StripeBillingPrice {
id: price_id.clone(),
meter_event_name: meter_event_name.to_string(),
});
}
}
}
let mut state = self.state.write().await;
let meter = if let Some(meter) = state.meters_by_event_name.get(meter_event_name) {
meter.clone() meter.clone()
} else { } else {
let meter = StripeMeter::create( let meter = StripeMeter::create(
@ -118,15 +136,13 @@ impl StripeBilling {
}, },
) )
.await?; .await?;
self.meters_by_event_name state
.write() .meters_by_event_name
.await
.insert(meter_event_name.to_string(), meter.clone()); .insert(meter_event_name.to_string(), meter.clone());
meter meter
}; };
let price_id = let price_id = if let Some(price_id) = state.price_ids_by_meter_id.get(&meter.id) {
if let Some(price_id) = self.price_ids_by_meter_id.read().await.get(&meter.id) {
price_id.clone() price_id.clone()
} else { } else {
let price = stripe::Price::create( let price = stripe::Price::create(
@ -172,9 +188,8 @@ impl StripeBilling {
}, },
) )
.await?; .await?;
self.price_ids_by_meter_id state
.write() .price_ids_by_meter_id
.await
.insert(meter.id, price.id.clone()); .insert(meter.id, price.id.clone());
price.id price.id
}; };