Skip to content

Add cancellation token support to CompleteTaskOnCloseStream #163

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 1 commit into from
May 20, 2025
Merged

Add cancellation token support to CompleteTaskOnCloseStream #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/Elastic.Transport/Components/TransportClient/Content/RequestDataContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ async Task SerializeToStreamAsync(Stream stream, TransportContext context, Cance
{
var source = CancellationTokenSource.CreateLinkedTokenSource(_token, cancellationToken);
var serializeToStreamTask = new TaskCompletionSource<bool>();
var wrappedStream = new CompleteTaskOnCloseStream(stream, serializeToStreamTask);
var wrappedStream = new CompleteTaskOnCloseStream(stream, serializeToStreamTask, source);
await _onStreamAvailableAsync(_boundConfiguration, _postData, wrappedStream, this, context, source.Token).ConfigureAwait(false);
await serializeToStreamTask.Task.ConfigureAwait(false);
}
Expand Down Expand Up @@ -153,18 +153,21 @@ protected override bool TryComputeLength(out long length)
internal class CompleteTaskOnCloseStream : DelegatingStream
{
private readonly TaskCompletionSource<bool> _serializeToStreamTask;
private readonly CancellationTokenSource? _source;

public CompleteTaskOnCloseStream(Stream innerStream, TaskCompletionSource<bool> serializeToStreamTask)
public CompleteTaskOnCloseStream(Stream innerStream, TaskCompletionSource<bool> serializeToStreamTask, CancellationTokenSource? source = null)
: base(innerStream)
{
Contract.Assert(serializeToStreamTask != null);
_serializeToStreamTask = serializeToStreamTask;
_source = source;
}

protected override void Dispose(bool disposing)
{
_serializeToStreamTask.TrySetResult(true);
base.Dispose();
_source?.Dispose();
}

public override void Close() => _serializeToStreamTask.TrySetResult(true);
Expand Down
Loading