Skip to content
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.

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

No end stream on ws connect and flush every message #73762

Merged
merged 10 commits into from
Aug 12, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1600,7 +1600,7 @@ private async ValueTask<Http2Stream> SendHeadersAsync(HttpRequestMessage request
// Start the write. This serializes access to write to the connection, and ensures that HEADERS
// and CONTINUATION frames stay together, as they must do. We use the lock as well to ensure new
// streams are created and started in order.
await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !http2Stream.ConnectProtocolEstablished), mustFlush), static (s, writeBuffer) =>
await PerformWriteAsync(totalSize, (thisRef: this, http2Stream, headerBytes, endStream: (request.Content == null && !request.IsWebSocketH2Request()), mustFlush ), static (s, writeBuffer) =>
greenEkatherine marked this conversation as resolved.
Show resolved Hide resolved
{
if (NetEventSource.Log.IsEnabled()) s.thisRef.Trace(s.http2Stream.StreamId, $"Started writing. Total header bytes={s.headerBytes.Length}");

Expand Down Expand Up @@ -1962,7 +1962,7 @@ public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, boo
try
{
// Send request headers
bool shouldExpectContinue = request.Content != null && request.HasHeaders && request.Headers.ExpectContinue == true;
bool shouldExpectContinue = (request.Content != null && request.HasHeaders && request.Headers.ExpectContinue == true) || request.IsWebSocketH2Request();
Http2Stream http2Stream = await SendHeadersAsync(request, cancellationToken, mustFlush: shouldExpectContinue).ConfigureAwait(false);
greenEkatherine marked this conversation as resolved.
Show resolved Hide resolved

bool duplex = request.Content != null && request.Content.AllowDuplex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,17 +411,19 @@ private ValueTask SendFrameLockAcquiredNonCancelableAsync(MessageOpcode opcode,
// If we get here, the cancellation token is not cancelable so we don't have to worry about it,
// and we own the semaphore, so we don't need to asynchronously wait for it.
ValueTask writeTask = default;
Task flushTask;
bool releaseSendBufferAndSemaphore = true;
try
{
// Write the payload synchronously to the buffer, then write that buffer out to the network.
int sendBytes = WriteFrameToSendBuffer(opcode, endOfMessage, disableCompression, payloadBuffer.Span);
writeTask = _stream.WriteAsync(new ReadOnlyMemory<byte>(_sendBuffer, 0, sendBytes));
flushTask = _stream.FlushAsync();
greenEkatherine marked this conversation as resolved.
Show resolved Hide resolved

// If the operation happens to complete synchronously (or, more specifically, by
// the time we get from the previous line to here), release the semaphore, return
// the task, and we're done.
if (writeTask.IsCompleted)
if (writeTask.IsCompleted && flushTask.IsCompleted)
{
return writeTask;
}
Expand All @@ -447,14 +449,15 @@ private ValueTask SendFrameLockAcquiredNonCancelableAsync(MessageOpcode opcode,
}
}

return WaitForWriteTaskAsync(writeTask);
return WaitForWriteTaskAsync(writeTask, flushTask);
}

private async ValueTask WaitForWriteTaskAsync(ValueTask writeTask)
private async ValueTask WaitForWriteTaskAsync(ValueTask writeTask, Task flushTask)
{
try
{
await writeTask.ConfigureAwait(false);
await flushTask.ConfigureAwait(false);
}
catch (Exception exc) when (!(exc is OperationCanceledException))
{
Expand All @@ -478,6 +481,7 @@ private async ValueTask SendFrameFallbackAsync(MessageOpcode opcode, bool endOfM
using (cancellationToken.Register(static s => ((ManagedWebSocket)s!).Abort(), this))
{
await _stream.WriteAsync(new ReadOnlyMemory<byte>(_sendBuffer, 0, sendBytes), cancellationToken).ConfigureAwait(false);
await _stream.FlushAsync(cancellationToken).ConfigureAwait(false);
}
}
catch (Exception exc) when (!(exc is OperationCanceledException))
Expand Down