Skip to content
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

[Part3.4][Live-scale] Implement add endpoint. #841

Merged
merged 11 commits into from
Mar 17, 2020
Merged

[Part3.4][Live-scale] Implement add endpoint. #841

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6595b0a
implement add endpoint.
JialinXin Mar 6, 2020
3d080fc
minor fix
JialinXin Mar 9, 2020
7d7239a
remove Wait()
JialinXin Mar 9, 2020
9b2f4be
Merge remote-tracking branch 'upstream/dev' into live-scale3.4
JialinXin Mar 13, 2020
c5813b7
minor fix
JialinXin Mar 13, 2020
e2cf8e6
move some default timespan to contants
JialinXin Mar 13, 2020
ff5c2e9
simplify serverids and resolve comments
JialinXin Mar 16, 2020
48fe896
Merge remote-tracking branch 'upstream/dev' into live-scale3.4
JialinXin Mar 16, 2020
239da10
Merge remote-tracking branch 'upstream/dev' into live-scale3.4
JialinXin Mar 17, 2020
8b879e7
fix merge error.
JialinXin Mar 17, 2020
68ea567
rename and minor improve
JialinXin Mar 17, 2020
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
3 changes: 1 addition & 2 deletions src/Microsoft.Azure.SignalR.Common/Endpoints/ScaleOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ namespace Microsoft.Azure.SignalR
internal enum ScaleOperation
{
Add,
Remove,
Rename
Remove
}
}
21 changes: 20 additions & 1 deletion src/Microsoft.Azure.SignalR.Common/Endpoints/ServiceEndpointManagerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private async Task AddServiceEndpointsAsync(IEnumerable<ServiceEndpoint> endpoin

await Task.WhenAll(hubEndpoints.Select(e => AddHubServiceEndpointAsync(e, cancellationToken)));

// TODO: update local store for negotiation
UpdateNegotiationEndpointsStore(hubEndpoints, ScaleOperation.Add);
}
catch (Exception ex)
{
Expand All @@ -155,6 +155,25 @@ private async Task AddServiceEndpointsAsync(IEnumerable<ServiceEndpoint> endpoin
}
}

private void UpdateNegotiationEndpointsStore(IReadOnlyList<HubServiceEndpoint> endpoints, ScaleOperation scaleOperation)
{
foreach (var hubEndpoint in _endpointsPerHub)
{
var updatedEndpoints = endpoints.Where(e => e.Hub == hubEndpoint.Key).ToList();
var oldEndpoints = hubEndpoint.Value;
var newEndpoints = oldEndpoints.ToList();
switch (scaleOperation)
{
case ScaleOperation.Add:
newEndpoints.AddRange(updatedEndpoints);
break;
default:
break;
}
_endpointsPerHub.TryUpdate(hubEndpoint.Key, newEndpoints, oldEndpoints);
}
}

private async Task RemoveServiceEndpointsAsync(IEnumerable<ServiceEndpoint> endpoints, CancellationToken cancellationToken)
{
if (endpoints.Count() > 0)
Expand Down
Loading