[6.1] Backport BAG failover fix. Ignore server provided failover partner. #3702
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR backports a BAG (Basic Availability Group) failover fix from #3625 to the 6.1 branch. The primary change introduces an AppContext switch IgnoreServerProvidedFailoverPartner that allows applications to ignore failover partner information provided by SQL Server, enabling explicit control over failover behavior (e.g., when using custom ports).
Key changes:
- Added new
IgnoreServerProvidedFailoverPartnerAppContext switch with default value offalse - Renamed
ServerProvidedFailOverPartnertoServerProvidedFailoverPartnerfor consistent casing throughout the codebase - Modified failover logic to respect the new switch when updating pool group failover partner designations
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs | Added new AppContext switch property and documentation, fixed typo "regardsless" → "regardless" |
| src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs | Extended test helper to support the new IgnoreServerProvidedFailoverPartner switch |
| src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs | Refactored failover partner property, implemented switch-aware failover logic, updated all references to use consistent casing |
| src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs | Applied same failover partner changes as netfx version for cross-platform consistency |
| src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs | Updated property reference to use corrected casing |
| src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs | Updated property reference to use corrected casing |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## release/6.1 #3702 +/- ##
===============================================
+ Coverage 67.50% 70.16% +2.66%
===============================================
Files 279 279
Lines 61750 61764 +14
===============================================
+ Hits 41685 43338 +1653
+ Misses 20065 18426 -1639
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
benrr101
requested changes
Oct 21, 2025
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Show resolved
Hide resolved
* Add IgnoreServerProvidedFailoverPartner app context switch. * Add behavior skip to netfx. * Consolidate to single property for failover partner value. * Rework checks to preserve server provided value, but ignore it. * Fix import. * Skip server failover partner override in �LoginNoFailover method. Add simulated server test coverage.
mdaigle
force-pushed
the
dev/mdaigle/6.1-bag-failover-fix
branch
from
c2fb0e0 to
1573736
Compare
|
I reapplied the cherry-pick and force pushed. This diff should hopefully be cleaner. |
benrr101
previously approved these changes
Oct 29, 2025
src/Microsoft.Data.SqlClient/tests/Common/LocalAppContextSwitchesHelper.cs
Show resolved
Hide resolved
apoorvdeshmukh
previously approved these changes
Oct 30, 2025
paulmedynski
previously approved these changes
Oct 30, 2025
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
mdaigle
dismissed stale reviews from paulmedynski, apoorvdeshmukh, and benrr101
via
f3b7349
benrr101
approved these changes
Oct 31, 2025
paulmedynski
approved these changes
Oct 31, 2025
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.
Description
Backports #3625