Skip to content

Commit e63dc1c

Browse files
committed
Removed server balancer flag from driver config and renamed session list
1 parent eca3da5 commit e63dc1c

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

src/Ydb.Sdk/src/Ado/YdbConnectionStringBuilder.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,7 @@ internal async Task<IDriver> BuildDriver()
347347
Password = Password,
348348
EnableMultipleHttp2Connections = EnableMultipleHttp2Connections,
349349
MaxSendMessageSize = MaxSendMessageSize,
350-
MaxReceiveMessageSize = MaxReceiveMessageSize,
351-
DisableServerBalancer = DisableServerBalancer
350+
MaxReceiveMessageSize = MaxReceiveMessageSize
352351
};
353352
var loggerFactory = LoggerFactory ?? NullLoggerFactory.Instance;
354353

src/Ydb.Sdk/src/DriverConfig.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class DriverConfig
2727

2828
public int MaxSendMessageSize { get; init; } = GrpcDefaultSettings.MaxSendMessageSize;
2929
public int MaxReceiveMessageSize { get; init; } = GrpcDefaultSettings.MaxReceiveMessageSize;
30-
public bool DisableServerBalancer { get; init; } = SessionPoolDefaultSettings.DisableServerBalancer;
3130

3231
internal X509Certificate2Collection CustomServerCertificates { get; } = new();
3332
internal TimeSpan EndpointDiscoveryInterval = TimeSpan.FromMinutes(1);

src/Ydb.Sdk/src/GrpcRequestSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class GrpcRequestSettings
88
{
99
public string TraceId { get; set; } = string.Empty;
1010
public TimeSpan TransportTimeout { get; set; } = TimeSpan.Zero;
11-
public List<string> List { get; } = new();
1211
public CancellationToken CancellationToken = default;
13-
12+
13+
internal List<string> ClientCapabilities { get; } = new();
1414
internal long NodeId { get; set; }
1515
internal Action<Grpc.Core.Metadata> TrailersHandler { get; set; } = _ => { };
1616
}

src/Ydb.Sdk/src/IDriver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ protected async ValueTask<CallOptions> GetCallOptions(GrpcRequestSettings settin
182182
meta.Add(Metadata.RpcTraceIdHeader, settings.TraceId);
183183
}
184184

185-
foreach (var setting in settings.List) {
185+
foreach (var setting in settings.ClientCapabilities) {
186186
meta.Add(Metadata.RpcClientCapabilitiesHeader, "session-balancer");
187187
}
188188

src/Ydb.Sdk/src/Services/Query/SessionPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected override async Task<Session> CreateSession(
4242

4343
if (!Config.DisableServerBalancer)
4444
{
45-
requestSettings.List.Add("session-balancer");
45+
requestSettings.ClientCapabilities.Add("session-balancer");
4646
}
4747

4848
var response = await _driver.UnaryCall(

src/Ydb.Sdk/src/Services/Table/SessionPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private protected override async Task<GetSessionResponse> CreateSession()
3131

3232
if (!Config.DisableServerBalancer)
3333
{
34-
createSessionSettings.List.Add("session-balancer");
34+
createSessionSettings.ClientCapabilities.Add("session-balancer");
3535
}
3636

3737
var createSessionResponse = await _tableClient.CreateSession(createSessionSettings);

0 commit comments

Comments
 (0)