Skip to content

Fix flaky ConnectTimeout_MultipleCalls_AttemptReconnect test #2460

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

Merged
merged 2 commits into from
Jun 13, 2024
Merged

Fix flaky ConnectTimeout_MultipleCalls_AttemptReconnect test #2460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b8b901
Fix flaky ConnectTimeout_MultipleCalls_AttemptReconnect test
JamesNK Jun 7, 2024
9765c1a
Fix
JamesNK Jun 7, 2024
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
22 changes: 19 additions & 3 deletions src/Grpc.Net.Client/Balancer/Internal/ConnectionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,20 @@ public void UpdateState(BalancerState state)
{
case PickResultType.Complete:
var subchannel = result.Subchannel!;
var address = subchannel.CurrentAddress;
var (address, state) = subchannel.GetAddressAndState();

if (address != null)
{
ConnectionManagerLog.PickResultSuccessful(Logger, subchannel.Id, address, subchannel.Transport.TransportStatus);
return (subchannel, address, result.SubchannelCallTracker);
if (state == ConnectivityState.Ready)
{
ConnectionManagerLog.PickResultSuccessful(Logger, subchannel.Id, address, subchannel.Transport.TransportStatus);
return (subchannel, address, result.SubchannelCallTracker);
}
else
{
ConnectionManagerLog.PickResultSubchannelNotReady(Logger, subchannel.Id, address, state);
previousPicker = currentPicker;
}
}
else
{
Expand Down Expand Up @@ -499,6 +507,9 @@ internal static class ConnectionManagerLog
private static readonly Action<ILogger, Status, Exception?> _resolverServiceConfigFallback =
LoggerMessage.Define<Status>(LogLevel.Debug, new EventId(12, "ResolverServiceConfigFallback"), "Falling back to previously loaded service config. Resolver failure when retreiving or parsing service config with status: {Status}");

private static readonly Action<ILogger, string, BalancerAddress, ConnectivityState, Exception?> _pickResultSubchannelNotReady =
LoggerMessage.Define<string, BalancerAddress, ConnectivityState>(LogLevel.Debug, new EventId(13, "PickResultSubchannelNotReady"), "Picked subchannel id '{SubchannelId}' with address {CurrentAddress} doesn't have a ready state. Subchannel state: {State}");

public static void ResolverUnsupportedLoadBalancingConfig(ILogger logger, IList<LoadBalancingConfig> loadBalancingConfigs)
{
if (logger.IsEnabled(LogLevel.Warning))
Expand Down Expand Up @@ -562,5 +573,10 @@ public static void ResolverServiceConfigFallback(ILogger logger, Status status)
{
_resolverServiceConfigFallback(logger, status, null);
}

public static void PickResultSubchannelNotReady(ILogger logger, string subchannelId, BalancerAddress currentAddress, ConnectivityState state)
{
_pickResultSubchannelNotReady(logger, subchannelId, currentAddress, state, null);
}
}
#endif
8 changes: 8 additions & 0 deletions src/Grpc.Net.Client/Balancer/Subchannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ public BalancerAddress? CurrentAddress
/// </summary>
public BalancerAttributes Attributes { get; }

internal (BalancerAddress? Address, ConnectivityState State) GetAddressAndState()
{
lock (Lock)
{
return (CurrentAddress, State);
}
}

internal Subchannel(ConnectionManager manager, IReadOnlyList<BalancerAddress> addresses)
{
Lock = new object();
Expand Down