Skip to content

fix: Wrap disable_uptime_monitor in a transaction for broken_monitor task #91989

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

Merged
merged 2 commits into from
May 22, 2025
Merged

fix: Wrap disable_uptime_monitor in a transaction for broken_monitor task #91989

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a042a
wrap disable in transaction
ajay-sentry May 20, 2025
c11614a
put inline with function instead
ajay-sentry May 21, 2025
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
53 changes: 30 additions & 23 deletions src/sentry/uptime/subscriptions/subscriptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,36 +343,43 @@ def disable_uptime_detector(detector: Detector):
and if the UptimeSubscription no longer has any active ProjectUptimeSubscriptions, it will
also be disabled.
"""
uptime_monitor = get_project_subscription(detector)
uptime_subscription: UptimeSubscription = uptime_monitor.uptime_subscription
with atomic_transaction(
using=(
router.db_for_write(UptimeSubscription),
router.db_for_write(ProjectUptimeSubscription),
router.db_for_write(Detector),
)
):
uptime_monitor = get_project_subscription(detector)
uptime_subscription: UptimeSubscription = uptime_monitor.uptime_subscription

if uptime_monitor.status == ObjectStatus.DISABLED and not detector.enabled:
return
if uptime_monitor.status == ObjectStatus.DISABLED and not detector.enabled:
return

if uptime_subscription.uptime_status == UptimeStatus.FAILED:
# Resolve the issue so that we don't see it in the ui anymore
resolve_uptime_issue(detector)
if uptime_subscription.uptime_status == UptimeStatus.FAILED:
# Resolve the issue so that we don't see it in the ui anymore
resolve_uptime_issue(detector)

# We set the status back to ok here so that if we re-enable we'll start
# from a good state
uptime_subscription.update(uptime_status=UptimeStatus.OK)
# We set the status back to ok here so that if we re-enable we'll start
# from a good state
uptime_subscription.update(uptime_status=UptimeStatus.OK)

uptime_monitor.update(status=ObjectStatus.DISABLED)
detector.update(enabled=False)
uptime_monitor.update(status=ObjectStatus.DISABLED)
detector.update(enabled=False)

quotas.backend.disable_seat(DataCategory.UPTIME, uptime_monitor)
quotas.backend.disable_seat(DataCategory.UPTIME, uptime_monitor)

# Are there any other project subscriptions associated to the subscription
# that are NOT disabled?
has_active_subscription = uptime_subscription.projectuptimesubscription_set.exclude(
status=ObjectStatus.DISABLED
).exists()
# Are there any other project subscriptions associated to the subscription
# that are NOT disabled?
has_active_subscription = uptime_subscription.projectuptimesubscription_set.exclude(
status=ObjectStatus.DISABLED
).exists()

# All project subscriptions are disabled, we can disable the subscription
# and remove the remote subscription.
if not has_active_subscription:
uptime_subscription.update(status=UptimeSubscription.Status.DISABLED.value)
delete_remote_uptime_subscription.delay(uptime_subscription.id)
# All project subscriptions are disabled, we can disable the subscription
# and remove the remote subscription.
if not has_active_subscription:
uptime_subscription.update(status=UptimeSubscription.Status.DISABLED.value)
delete_remote_uptime_subscription.delay(uptime_subscription.id)


def enable_uptime_detector(detector: Detector, ensure_assignment: bool = False):
Expand Down
Loading