Repository navigation
v4: prefer the announced hostname when dialing a cluster node (port of #3333) - #3359
Merged
Merged
Conversation
) The one main commit v4 had not absorbed (ca51eb6). The shadow-topology machinery is shared between the branches - ClusterTopology.cs is identical and ApplyTopologyGenerationAsync / ReconfigureAsync carry the same structure - so the cherry-pick applied without conflict; verified that the hunks landed inside v4's live ReconfigureAsync path and that the re-home runs on every applied topology here too. As on main: ClusterTopologyNode gains PreferredDialEndPoint (the form the deployment announced first); topology application re-homes a node held by a companion address onto its announced hostname (adopted at the exact form so the repair does not resolve through the alias being repaired, retired through the existing duplicate-merge machinery; configured seeds exempt); and discovery creates a SLOTS-listed node at its announced form in the first place, so the common path never creates the companion server at all. Tests ported with it: PreferredDialEndPointFollowsAnnouncedForm, HostnameAnnouncedShardIsDiscoveredByHostname and ShardHeldByAddressMovesToItsAnnouncedHostname, plus the ApplyTopologyAsync helper. ClusterTopologyUnitTests 17/17 and EndpointResolutionUnitTests 5/5 green on net10.0.
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.
Brings v4 level with
main: ca51eb6 (#3333) was the one commit the 3.4.31 intent-merge (#3355) did not cover, having landed onmainafter it.Unlike the previous ports, this one is a clean cherry-pick rather than a re-expression: the shadow-topology machinery is shared between the branches (
ClusterTopology.csis byte-identical, andApplyTopologyGenerationAsync/ReconfigureAsynckeep the same structure in v4'sConnectionMultiplexer). I verified the hunks landed inside v4's liveReconfigureAsyncpath — v4 still refreshes topology through it (UpdateClusterRange(ClusterTopology)+ApplyTopologyGenerationAsync), withRespTopologyalongside — so the re-home applies on every topology application here exactly as onmain.What it does (as on
main):ClusterTopologyNode.PreferredDialEndPoint: the endpoint form the deployment announced first (cluster-preferred-endpoint-type) — the form TLS can validate, and the one most likely routable from the client.CLUSTER NODES, Feature Request: Add Automatic ForceReconnect Recovery for Persistent ConnectionMultiplexer Connection Failures #3309) onto its announced hostname: adopted at the exact form (exactForm: true, so the repair does not resolve through the alias being repaired) and the companion server retired through the existing duplicate-merge machinery. Configured seeds are exempt.Tests ported with it:
PreferredDialEndPointFollowsAnnouncedForm,HostnameAnnouncedShardIsDiscoveredByHostname,ShardHeldByAddressMovesToItsAnnouncedHostname, plus theApplyTopologyAsynchelper.ClusterTopologyUnitTests17/17 andEndpointResolutionUnitTests5/5 green locally on net10.0; full library build clean on all TFMs.After this lands, true drift from
mainis zero (the ledger's note onrev-listoverstating still applies — ancestry is not joined).