Skip to content

Fix service bus client lifecycle#4930

Open
JC-wk wants to merge 4 commits into
microsoft:mainfrom
JC-wk:fix-service-bus-client-lifecycle
Open

Fix service bus client lifecycle#4930
JC-wk wants to merge 4 commits into
microsoft:mainfrom
JC-wk:fix-service-bus-client-lifecycle

Conversation

@JC-wk

@JC-wk JC-wk commented Jun 8, 2026

Copy link
Copy Markdown
Collaborator

What is being addressed

inconsistent ServiceBusClient lifecycle management in deployment_status_updater.py, airlock_request_status_update.py, and runner.py.
key message listeners repeatedly instantiate ServiceBusClient inside infinite loops but discard the instances without calling close() or wrapping them in context managers. This can leak connection sockets and AMQP channels under transient reconnect loops.

How is this addressed

  • Prevents connection socket leaks: ServiceBusClient instances are now properly closed using async context managers
    Prevents AMQP channel leaks: Ensures channels are cleaned up even under transient reconnect scenarios
    Consistent pattern: All three files now follow the same best practice of using
  • Update CHANGELOG.md
  • Increment version

James Chapman added 2 commits June 8, 2026 15:53
…status_updater.py, airlock_request_status_update.py, and runner.py to prevent connection socket and AMQP channel leaks
…and deployment_status_updater.py for improved heartbeat logging and error handling; update test_runner.py to mock ServiceBusClient correctly; enhance runner.py with consistent exception handling and retry logic.
@JC-wk JC-wk requested a review from a team as a code owner June 8, 2026 16:20
Copilot AI review requested due to automatic review settings June 8, 2026 16:20
@github-actions

github-actions Bot commented Jun 8, 2026

Copy link
Copy Markdown

Unit Test Results

673 tests   673 ✅  8s ⏱️
  1 suites    0 💤
  1 files      0 ❌

Results for commit 32114de.

♻️ This comment has been updated with latest results.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes inconsistent Azure Service Bus client lifecycle handling across the API service-bus listeners and the resource processor runner to reduce the risk of leaking sockets/AMQP channels during long-running polling and reconnect loops.

Changes:

  • Wrap ServiceBusClient usage in async context managers so clients are deterministically closed.
  • Add backoff (asyncio.sleep(10)) on connection/unknown exceptions in the runner and service-bus listeners.
  • Update runner unit tests to account for the async context manager usage; add a changelog entry.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
api_app/service_bus/deployment_status_updater.py Uses async with ServiceBusClient(...) to ensure the client is closed across reconnect cycles.
api_app/service_bus/airlock_request_status_update.py Uses async with ServiceBusClient(...) to ensure the client is closed; adjusts retry sleeps.
resource_processor/vmss_porter/runner.py Uses async with ServiceBusClient(...) for proper client teardown; adds retry sleeps on exceptions.
resource_processor/tests_rp/test_runner.py Updates mocks to handle the ServiceBusClient async context manager behavior.
CHANGELOG.md Adds an unreleased BUG FIXES entry for the lifecycle fix.

Comment thread api_app/service_bus/airlock_request_status_update.py Outdated
Comment thread CHANGELOG.md Outdated
Comment thread CHANGELOG.md
James Chapman and others added 2 commits June 8, 2026 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants