Port partition split recursion fix from hotfix to main by Copilot · Pull Request #44770 · Azure/azure-sdk-for-python

Copilot · 2026-01-20T21:00:04Z

Port Cosmos DB Partition Split Recursion Fix from PR #44649

This task involves porting critical bug fixes from PR #44649 that was merged to the hotfix branch. The fix addresses an infinite recursion issue during partition split (410 error) handling.

Plan Checklist:

Summary

Successfully ported all changes from PR #44649 to the main branch and addressed PR review feedback:

Key Changes:

_internal_pk_range_fetch flag: Prevents infinite recursion by marking partition key range queries as internal
State reset logic: Resets _has_started and _continuation to ensure retry logic works correctly
Comprehensive logging: Added debug, warning, and error logging for partition split scenarios (including warnings for unreachable code paths)
Request handlers updated: Both sync and async request handlers now pop internal flags

Files Modified (10):

CHANGELOG.md (bug fix entry added)
4 execution context files (sync + async) - now with additional warning logs
4 routing provider files (sync + async)
2 request handler files (sync + async)
1 existing test file (kwargs support)
2 new comprehensive test files (sync + async unit tests)

All files are syntactically correct and ready for testing with Cosmos DB emulator.

Original prompt

This section details on the original issue you should resolve

<issue_title>[Cosmos] port changes over to main branch</issue_title>
<issue_description>Some changes were made to a feature branch that were merged in and released separately from our main branch. The changes are present here: #44649

The task at hand is to port over all of the changes in that pull request so that the feature branch and main branches both have those changes.</issue_description>

<agent_instructions>Follow the instructions in the issue. If you can't see the changes in the referenced pull request, make sure to let me know.</agent_instructions>

Comments on the Issue (you are @copilot in this section)

Fixes [Cosmos] port changes over to main branch #44769

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: simorenoh <[email protected]>

sdk/cosmos/azure-cosmos/CHANGELOG.md

Copilot

Pull request overview

This PR ports a critical bug fix for infinite recursion during partition split (410 Gone) errors from the hotfix branch to the main branch. The fix prevents a timeout issue caused by recursive 410 retry logic when the SDK attempts to refresh partition key ranges during a partition split.

Changes:

Added _internal_pk_range_fetch flag to mark internal partition key range queries and skip 410 retry logic, breaking the recursion cycle
Implemented state reset (_has_started=False, _continuation=None) before 410 retries to ensure fetch loops execute correctly
Added structured logging for 410 handling with debug/warning/error levels
Comprehensive unit tests (645 lines) covering state reset, retry logic, recursion prevention, and memory bounds

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
CHANGELOG.md	Added bug fix entry under 4.15.0b3
azure/cosmos/_execution_context/base_execution_context.py	Added recursion prevention, state reset, and logging for 410 retry logic (sync)
azure/cosmos/_execution_context/aio/base_execution_context.py	Added recursion prevention, state reset, and logging for 410 retry logic (async)
azure/cosmos/_routing/routing_map_provider.py	Propagated `_internal_pk_range_fetch` flag to PK range queries and added logging (sync)
azure/cosmos/_routing/aio/routing_map_provider.py	Propagated `_internal_pk_range_fetch` flag to PK range queries and added logging (async)
azure/cosmos/_synchronized_request.py	Removed internal flag before HTTP layer (sync)
azure/cosmos/aio/_asynchronous_request.py	Removed internal flag before HTTP layer (async)
tests/test_partition_split_retry_unit.py	Comprehensive unit tests for state reset, retry behavior, and memory bounds (sync)
tests/test_partition_split_retry_unit_async.py	Comprehensive unit tests for state reset, retry behavior, and memory bounds (async)
tests/routing/test_routing_map_provider.py	Updated test signature to accept **kwargs

simorenoh · 2026-01-21T20:38:18Z

/azp run python - cosmos - tests

azure-pipelines · 2026-01-21T20:38:36Z

Azure Pipelines successfully started running 1 pipeline(s).

tvaron3

LGTM

allenkim0129

LGTM.

Has some minor comments

sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/aio/base_execution_context.py

sdk/cosmos/azure-cosmos/azure/cosmos/_routing/aio/routing_map_provider.py

sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_map_provider.py

allenkim0129

LGTM

…t retry logic Co-authored-by: simorenoh <[email protected]>

Copilot · 2026-01-21T22:58:55Z

Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

scanning-api.github.com
- Triggering command: /home/REDACTED/work/_temp/ghcca-node/node/bin/node /home/REDACTED/work/_temp/ghcca-node/node/bin/node --enable-source-maps /home/REDACTED/work/_temp/copilot-developer-action-main/dist/index.js (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

Configure Actions setup steps to set up my environment, which run before the firewall is enabled
Add the appropriate URLs or hosts to the custom allowlist in this repository's Copilot coding agent settings (admins only)

bambriz

Thanks @simorenoh Looks good to me.

simorenoh · 2026-01-22T03:01:57Z

/check-enforcer override

bambriz

Reapproving

Initial plan

de223c9

Copilot AI assigned Copilot and simorenoh Jan 20, 2026

Copilot started work on behalf of simorenoh January 20, 2026 21:00 View session

Port partition split recursion fix from PR #44649 to main branch

592809a

Co-authored-by: simorenoh <[email protected]>

Copilot AI changed the title ~~[WIP] Port changes from feature branch to main branch~~ Port partition split recursion fix from hotfix to main Jan 20, 2026

Copilot AI requested a review from simorenoh January 20, 2026 21:11

Copilot finished work on behalf of simorenoh January 20, 2026 21:11

simorenoh reviewed Jan 20, 2026

View reviewed changes

sdk/cosmos/azure-cosmos/CHANGELOG.md Outdated Show resolved Hide resolved

Update sdk/cosmos/azure-cosmos/CHANGELOG.md

5c58ff5

simorenoh approved these changes Jan 20, 2026

View reviewed changes

simorenoh marked this pull request as ready for review January 20, 2026 23:12

simorenoh requested a review from a team as a code owner January 20, 2026 23:12

Copilot AI review requested due to automatic review settings January 20, 2026 23:12

Copilot started reviewing on behalf of simorenoh January 20, 2026 23:13 View session

Copilot AI reviewed Jan 20, 2026

View reviewed changes

tvaron3 approved these changes Jan 21, 2026

View reviewed changes

allenkim0129 reviewed Jan 21, 2026

View reviewed changes

Copilot started work on behalf of simorenoh January 21, 2026 22:56 View session

allenkim0129 approved these changes Jan 21, 2026

View reviewed changes

Add warning log before unreachable return statement in partition spli…

8a9405c

…t retry logic Co-authored-by: simorenoh <[email protected]>

Copilot finished work on behalf of simorenoh January 21, 2026 22:59

Copilot AI requested a review from simorenoh January 21, 2026 22:59

simorenoh approved these changes Jan 21, 2026

View reviewed changes

simorenoh enabled auto-merge (squash) January 21, 2026 23:00

bambriz approved these changes Jan 21, 2026

View reviewed changes

bambriz approved these changes Jan 22, 2026

View reviewed changes

simorenoh merged commit 9a8a19a into main Jan 22, 2026
22 checks passed

simorenoh deleted the copilot/port-changes-to-main-branch branch January 22, 2026 03:19

Conversation

Copilot AI commented Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Port Cosmos DB Partition Split Recursion Fix from PR #44649

Plan Checklist:

Summary

Key Changes:

Files Modified (10):

Comments on the Issue (you are @copilot in this section)

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

simorenoh commented Jan 21, 2026

Uh oh!

azure-pipelines bot commented Jan 21, 2026

Uh oh!

tvaron3 left a comment

Choose a reason for hiding this comment

Uh oh!

allenkim0129 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

allenkim0129 left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Jan 21, 2026

I tried to connect to the following addresses, but was blocked by firewall rules:

Uh oh!

bambriz left a comment

Choose a reason for hiding this comment

Uh oh!

simorenoh commented Jan 22, 2026

Uh oh!

bambriz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Copilot AI commented Jan 20, 2026 •

edited

Loading