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

feat(core): add redis lock during insertion of event in event table during initial attempt of outgoing webhook delivery #7579

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(core): add redis lock during insertion of event in event table during initial attempt of outgoing webhook delivery #7579

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 36 additions & 1 deletion crates/router/src/core/webhooks/outgoing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use super::{types, utils, MERCHANT_ID};
use crate::compatibility::stripe::webhooks as stripe_webhooks;
use crate::{
core::{
api_locking,
errors::{self, CustomResult},
metrics,
},
Expand All @@ -33,7 +34,7 @@ use crate::{
OutgoingWebhookEvent, OutgoingWebhookEventContent, OutgoingWebhookEventMetric,
},
logger,
routes::{app::SessionStateInfo, SessionState},
routes::{app::SessionStateInfo, lock_utils, SessionState},
services,
types::{
api,
Expand Down Expand Up @@ -135,6 +136,36 @@ pub(crate) async fn create_event_and_trigger_outgoing_webhook(
metadata: Some(event_metadata),
};

let lock_action = api_locking::LockAction::Hold {
input: api_locking::LockingInput {
unique_locking_key: idempotent_event_id.to_string().to_owned(),
api_identifier: lock_utils::ApiIdentifier::Webhooks,
override_lock_retries: None,
},
};

lock_action
.clone()
.perform_locking_action(&state, merchant_account.get_id().to_owned())
.await?;

if (state
.store
.find_event_by_merchant_id_event_id(
key_manager_state,
&merchant_id,
&event_id,
merchant_key_store,
)
.await)
.is_ok()
{
logger::debug!(
"Event with idempotent ID `{idempotent_event_id}` already exists in the database"
);
return Ok(());
}

let event_insert_result = state
.store
.insert_event(key_manager_state, new_event, merchant_key_store)
Expand All @@ -155,6 +186,10 @@ pub(crate) async fn create_event_and_trigger_outgoing_webhook(
}
}?;

lock_action
.free_lock_action(&state, merchant_account.get_id().to_owned())
.await?;

let process_tracker = add_outgoing_webhook_retry_task_to_process_tracker(
&*state.store,
&business_profile,
Expand Down
Loading