Skip to content

Handle successful resource update retries correctly #5025

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

Open
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Handle successful resource update retries correctly #5025

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19596e4
Initial plan
Copilot Aug 1, 2026
995802f
Add retry success regression coverage
Copilot Aug 1, 2026
eb3d3b5
Update changelog and API version for retry fix
Copilot Aug 1, 2026
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
2 changes: 1 addition & 1 deletion api_app/service_bus/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ async def try_update_with_retries(num_retries: int, attempt_count: int, resource
except CosmosAccessConditionFailedError as e:
logger.warning(f"Etag mismatch for {resource_to_update_id}. Retrying.")
if attempt_count < num_retries:
await try_update_with_retries(
return await try_update_with_retries(
Comment thread
jonnyry marked this conversation as resolved.
num_retries=num_retries,
attempt_count=(attempt_count + 1),
resource_repo=resource_repo,
Expand Down
43 changes: 43 additions & 0 deletions api_app/tests_ma/test_service_bus/test_resource_request_sender.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,49 @@ async def test_multi_step_document_sends_first_step(
)


@patch("service_bus.resource_request_sender.ResourceHistoryRepository.create")
@patch("service_bus.resource_request_sender.ResourceRepository.create")
@patch("service_bus.resource_request_sender.ResourceTemplateRepository.create")
async def test_multi_step_document_retries_then_succeeds(
Comment thread
jonnyry marked this conversation as resolved.
resource_template_repo,
resource_repo,
resource_history_repo,
basic_shared_service,
basic_shared_service_template,
test_user,
multi_step_resource_template,
primary_resource
):

resource_repo.get_resource_by_id.return_value = basic_shared_service
resource_template_repo.get_template_by_name_and_version.return_value = (
basic_shared_service_template
)
updated_resource = basic_shared_service.copy(update={"etag": "updated-etag"})
resource_repo.patch_resource.side_effect = [
CosmosAccessConditionFailedError(),
(updated_resource, basic_shared_service_template),
]

result = await try_update_with_retries(
num_retries=5,
attempt_count=0,
resource_repo=resource_repo,
resource_template_repo=resource_template_repo,
user=test_user,
resource_to_update_id="resource-id",
template_step=multi_step_resource_template.pipeline.install[0],
resource_history_repo=resource_history_repo,
primary_resource=primary_resource,
primary_parent_workspace=None,
primary_parent_workspace_svc=None
)

assert result == updated_resource
assert len(resource_repo.patch_resource.mock_calls) == 2
assert len(resource_repo.get_resource_by_id.mock_calls) == 2


@patch("service_bus.resource_request_sender.ResourceHistoryRepository.create")
@patch("service_bus.resource_request_sender.ResourceRepository.create")
@patch("service_bus.resource_request_sender.ResourceTemplateRepository.create")
Expand Down