Skip to content

Closing initial cluster discovery connection #1741

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

Closed
wants to merge 6 commits into from
Closed

Closing initial cluster discovery connection #1741

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f68120
Closing initial cluster discovery connection
deepakverma Jun 1, 2021
b44e6f1
remove
deepakverma Jun 12, 2021
ca60494
Merge branch 'main' into pr/1741
NickCraver Jun 21, 2021
aa87268
Merge branch 'main' into pr/1741
NickCraver Jun 21, 2021
7f1b086
if it's a discovery endpoint close it (i.e. endpoint is not in the li…
deepakverma Jun 22, 2021
33d1d3c
Removing the first check, as it would reconnect to the discovery conn…
deepakverma Jun 22, 2021
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
41 changes: 41 additions & 0 deletions src/StackExchange.Redis/ConnectionMultiplexer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,25 @@ internal ServerSnapshot Add(ServerEndPoint value)
return new ServerSnapshot(arr, _count + 1);
}

internal ServerSnapshot Remove(ServerEndPoint value)
{
if (value == null) return this;
var arr = _arr;
var arrCopy = new ServerEndPoint[arr.Length];
int inserted = 0;
for (int i = 0; i < _count; ++i)
{
if (arr[i] != value)
{
arrCopy[inserted++] = arr[i];
}
}

if (inserted == _count) return this;

return new ServerSnapshot(arrCopy, inserted);
}

internal EndPoint[] GetEndPoints()
{
if (_count == 0) return Array.Empty<EndPoint>();
Expand Down Expand Up @@ -1817,6 +1836,28 @@ internal async Task<bool> ReconfigureAsync(bool first, bool reconfigureAll, LogP
// and try to connect to these other nodes in the next iteration
encounteredConnectedClusterServer = true;
updatedClusterEndpointCollection = await GetEndpointsFromClusterNodes(server, log).ForAwait();

if (updatedClusterEndpointCollection?.Count > 0 && server?.EndPoint != null)
{
// if it's a discovery endpoint close it (i.e. endpoint is not in the list of ips returned by cluster nodes command)
var endpointInClusterNodes = updatedClusterEndpointCollection.FirstOrDefault( endpoint => server.EndPoint.Equals(endpoint));
if (endpointInClusterNodes == null)
{
// close the initial cluster discovery connection as it's no longer needed
Task[] closeTask = new Task[2];
closeTask[0] = server.Close(ConnectionType.Interactive);
closeTask[1] = server.Close(ConnectionType.Subscription);
await Task.WhenAll(closeTask);
// server cleanup
lock (this.servers)
{
this.servers.Remove(server.EndPoint);
_serverSnapshot.Remove(server);
}
server.Dispose();
}
continue;
}
}

// set the server UnselectableFlags and update masters list
Expand Down