Set bounds for RetryPolicyOptions#2187
Merged
srnagar merged 5 commits intomicrosoft:mainfrom Mar 25, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Caps Azure SDK retry policy MaxRetries to prevent excessively large retry configurations and adds tests + changelog entry to document/verify the behavior.
Changes:
- Enforce an upper bound of
10forclientOptions.Retry.MaxRetriesinBaseAzureService.ConfigureRetryPolicy. - Add a unit test to verify retry cap behavior via a test-only public wrapper.
- Add a changelog entry describing the retry bounds change.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| servers/Azure.Mcp.Server/changelog-entries/1774384466055.yaml | Documents the retry policy bounds change in the Azure MCP Server changelog. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Services/Azure/BaseAzureServiceTests.cs | Adds a unit test to validate MaxRetries is capped at 10. |
| core/Azure.Mcp.Core/src/Services/Azure/BaseAzureService.cs | Implements the cap of MaxRetries to 10 in retry configuration. |
core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Services/Azure/BaseAzureServiceTests.cs
Outdated
Show resolved
Hide resolved
xiangyan99
approved these changes
Mar 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This pull request introduces a safeguard to the retry policy configuration in
BaseAzureServiceto prevent excessive retries, and adds corresponding unit tests to verify this behavior. The main focus is to ensure that the maximum number of retries does not exceed 10, even if a higher value is specified.Retry Policy Enforcement:
ConfigureRetryPolicyinBaseAzureServiceto capclientOptions.Retry.MaxRetriesat 10, regardless of the value provided inRetryPolicyOptions. This prevents the system from being configured with an excessive number of retries, which could lead to service rate limiting the client.Testing Improvements:
ConfigureRetryPolicy_CapsMaxRetriesAt10inBaseAzureServiceTeststo verify that the maximum retries are capped at 10 when a higher value is specified.ConfigureRetryPolicyPublicin the test subclass to facilitate testing of the protectedConfigureRetryPolicymethod.GitHub issue number?
[Link to the GitHub issue this PR addresses]Pre-merge Checklist
servers/Azure.Mcp.Server/README.mdand/orservers/Fabric.Mcp.Server/README.mddocumentationREADME.mdchanges running the script./eng/scripts/Process-PackageReadMe.ps1. See Package READMEToolDescriptionEvaluatorand obtained a score of0.4or more and a top 3 ranking for all related test promptsconsolidated-tools.jsonbreaking-changelabelservers/Azure.Mcp.Server/docs/azmcp-commands.md./eng/scripts/Update-AzCommandsMetadata.ps1to update tool metadata inazmcp-commands.md(required for CI)servers/Azure.Mcp.Server/docs/e2eTestPrompts.mdcrypto mining, spam, data exfiltration, etc.)/azp run mcp - pullrequest - liveto run Live Test Pipeline