Skip to content

fix cancellation-token-source disposing #1306

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
ebozduman merged 2 commits into from
Jul 1, 2025
Merged

fix cancellation-token-source disposing #1306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00512d6
fix ct disposing
Apr 29, 2025
a921a4f
Lint change
Jul 1, 2025
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
13 changes: 5 additions & 8 deletions Minio/RequestExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,11 @@ internal static async Task<ResponseResult> ExecuteTaskAsync(this IMinioClient mi
{
var startTime = DateTime.Now;
var responseResult = new ResponseResult(requestMessageBuilder.Request, response: null);
if (minioClient.Config.RequestTimeout > 0)
{
using var internalTokenSource =
new CancellationTokenSource(new TimeSpan(0, 0, 0, 0, minioClient.Config.RequestTimeout));
using var timeoutTokenSource =
CancellationTokenSource.CreateLinkedTokenSource(internalTokenSource.Token, cancellationToken);
cancellationToken = timeoutTokenSource.Token;
}
using var internalTokenSource =
new CancellationTokenSource(new TimeSpan(0, 0, 0, 0, minioClient.Config.RequestTimeout));
using var timeoutTokenSource =
CancellationTokenSource.CreateLinkedTokenSource(internalTokenSource.Token, cancellationToken);
if (minioClient.Config.RequestTimeout > 0) cancellationToken = timeoutTokenSource.Token;

responseResult = await minioClient.ExecuteWithRetry(
async Task<ResponseResult> () => await minioClient.ExecuteTaskCoreAsync(
Expand Down