Skip to content

Fix shutdown of periodic_updater #4711

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
jochenehret merged 2 commits into from
Dec 19, 2025
Merged

Fix shutdown of periodic_updater #4711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb5f75
Fix shutdown of periodic_updater
jochenehret Dec 17, 2025
dd61383
Use at_exit hook to shut down periodic_updater
jochenehret Dec 19, 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
15 changes: 14 additions & 1 deletion lib/cloud_controller/runners/puma_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ def initialize(config, app, logger, periodic_updater, request_logs)
prometheus_updater.update_gauge_metric(:cc_db_connection_pool_timeouts_total, 0, labels: { process_type: 'main' })
@periodic_updater.setup_updates
end

events.after_stopped do
@periodic_updater.stop_updates unless @periodic_updater.nil?
stop_periodic_updates
end

@puma_launcher = Puma::Launcher.new(puma_config, log_writer:, events:)
Expand All @@ -78,6 +79,18 @@ def start!

private

def stop_periodic_updates
@periodic_updater&.stop_updates
@logger.info('Successfully stopped periodic updates in after_stopped')
rescue ThreadError
at_exit do
@periodic_updater&.stop_updates
@logger.info('Successfully stopped periodic updates in at_exit')
end
rescue StandardError => e
@logger.error("Failed to stop periodic updates: #{e}\n#{e.backtrace&.join("\n")}")
end

def prometheus_updater
CloudController::DependencyLocator.instance.prometheus_updater
end
Expand Down