Skip to content

Commit e748a85

Browse files
committed
fix lint
1 parent 622b48e commit e748a85

File tree

3 files changed

+25
-19
lines changed

3 files changed

+25
-19
lines changed

src/Ydb.Sdk/src/Ado/PoolManager.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,17 @@ CancellationToken cancellationToken
3636

3737
driver.RegisterOwner();
3838

39-
var factory = new PoolingSessionFactory(driver, settings);
40-
var newSessionPool = new PoolingSessionSource<PoolingSession>(factory, settings);
39+
ISessionSource newSessionPool;
40+
41+
if (settings.MaxSessionPool > 0)
42+
{
43+
var factory = new PoolingSessionFactory(driver, settings);
44+
newSessionPool = new PoolingSessionSource<PoolingSession>(factory, settings);
45+
}
46+
else
47+
{
48+
newSessionPool = new ImplicitSessionSource(driver);
49+
}
4150

4251
Pools[settings.ConnectionString] = newSessionPool;
4352

src/Ydb.Sdk/src/Ado/YdbDataSource.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ public async ValueTask<YdbConnection> OpenRetryableConnectionAsync(CancellationT
391391
try
392392
{
393393
await ydbConnection.OpenAsync(_retryPolicyExecutor, cancellationToken);
394+
394395
return ydbConnection;
395396
}
396397
catch
@@ -408,7 +409,8 @@ public async ValueTask<YdbConnection> OpenRetryableConnectionAsync(
408409
var ydbConnection = CreateDbConnection();
409410
try
410411
{
411-
await ydbConnection.OpenAsync(_retryPolicyExecutor, cancellationToken);
412+
await ydbConnection.OpenAsync(GetExecutor(ydbRetryPolicyConfig), cancellationToken);
413+
412414
return ydbConnection;
413415
}
414416
catch
@@ -426,7 +428,8 @@ public async ValueTask<YdbConnection> OpenRetryableConnectionAsync(
426428
var ydbConnection = CreateDbConnection();
427429
try
428430
{
429-
await ydbConnection.OpenAsync(_retryPolicyExecutor, cancellationToken);
431+
await ydbConnection.OpenAsync(new YdbRetryPolicyExecutor(retryPolicy), cancellationToken);
432+
430433
return ydbConnection;
431434
}
432435
catch

src/Ydb.Sdk/test/Ydb.Sdk.Ado.Tests/Session/YdbImplicitStressTests.cs

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,17 @@ public async Task Dispose_WaitsForAllLeases_AndSignalsOnEmptyExactlyOnce()
2929

3030
var source = new ImplicitSessionSource(driver);
3131

32-
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
33-
3432
var workers = Enumerable.Range(0, 200).Select(async _ =>
3533
{
3634
var rnd = Random.Shared;
3735
for (var j = 0; j < 10; j++)
3836
{
3937
try
4038
{
41-
var s = await source.OpenSession(cts.Token);
39+
var s = await source.OpenSession(CancellationToken.None);
4240
opened.Inc();
4341

44-
await Task.Delay(rnd.Next(0, 5), cts.Token);
42+
await Task.Delay(rnd.Next(0, 5));
4543

4644
s.Dispose();
4745
closed.Inc();
@@ -54,9 +52,9 @@ public async Task Dispose_WaitsForAllLeases_AndSignalsOnEmptyExactlyOnce()
5452

5553
var disposer = Task.Run(async () =>
5654
{
57-
await Task.Delay(10, cts.Token);
55+
await Task.Delay(10);
5856
await source.DisposeAsync();
59-
}, cts.Token);
57+
});
6058

6159
await Task.WhenAll(workers.Append(disposer));
6260

@@ -76,19 +74,17 @@ public async Task Stress_Counts_AreBalanced()
7674

7775
var source = new ImplicitSessionSource(driver);
7876

79-
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
80-
8177
var workers = Enumerable.Range(0, 200).Select(async _ =>
8278
{
8379
var rnd = Random.Shared;
8480
for (var j = 0; j < 10; j++)
8581
{
8682
try
8783
{
88-
var s = await source.OpenSession(cts.Token);
84+
var s = await source.OpenSession(CancellationToken.None);
8985
opened.Inc();
9086

91-
await Task.Delay(rnd.Next(0, 3), cts.Token);
87+
await Task.Delay(rnd.Next(0, 3));
9288

9389
s.Dispose();
9490
closed.Inc();
@@ -99,7 +95,7 @@ public async Task Stress_Counts_AreBalanced()
9995
}
10096
}).ToArray();
10197

102-
var disposer = Task.Run(async () => await source.DisposeAsync(), cts.Token);
98+
var disposer = Task.Run(async () => await source.DisposeAsync());
10399

104100
await Task.WhenAll(workers.Append(disposer));
105101

@@ -116,13 +112,11 @@ public async Task Open_RacingWithDispose_StateRemainsConsistent()
116112

117113
var source = new ImplicitSessionSource(driver);
118114

119-
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
120-
121115
var opens = Enumerable.Range(0, 1000).Select(async _ =>
122116
{
123117
try
124118
{
125-
var s = await source.OpenSession(cts.Token);
119+
var s = await source.OpenSession(CancellationToken.None);
126120
s.Dispose();
127121
return 1;
128122
}
@@ -136,7 +130,7 @@ public async Task Open_RacingWithDispose_StateRemainsConsistent()
136130
{
137131
await Task.Yield();
138132
await source.DisposeAsync();
139-
}, cts.Token);
133+
});
140134

141135
await Task.WhenAll(opens.Append(disposeTask));
142136

0 commit comments

Comments
 (0)