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.

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

Apply max responseBodySize correctly #6372

Merged
merged 2 commits into from
Dec 14, 2023
Merged

Apply max responseBodySize correctly #6372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b577dbd
Apply max responseBodySize correctly
benaadams Dec 14, 2023
17aa3df
Fix log
benaadams Dec 14, 2023
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: 2 additions & 5 deletions src/Nethermind/Nethermind.Runner/JsonRpc/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,10 @@ void SerializeTimeoutException(IJsonRpcService service, IBufferWriter<byte> resu
try
{
JsonRpcContext jsonRpcContext = JsonRpcContext.Http(jsonRpcUrl);
long totalResponseSize = 0;
await foreach (JsonRpcResult result in jsonRpcProcessor.ProcessAsync(request, jsonRpcContext))
{
Stream stream = jsonRpcConfig.BufferResponses ? new MemoryStream() : null;
ICountingBufferWriter resultWriter = stream is not null ? new CountingStreamPipeWriter(stream) : new CountingPipeWriter(ctx.Response.BodyWriter);

try
{
ctx.Response.ContentType = "application/json";
Expand Down Expand Up @@ -198,9 +196,9 @@ void SerializeTimeoutException(IJsonRpcService service, IBufferWriter<byte> resu
_ = jsonRpcLocalStats.ReportCall(entry.Report);

// We reached the limit and don't want to responded to more request in the batch
if (!jsonRpcContext.IsAuthenticated && totalResponseSize > jsonRpcConfig.MaxBatchResponseBodySize)
if (!jsonRpcContext.IsAuthenticated && resultWriter.WrittenCount > jsonRpcConfig.MaxBatchResponseBodySize)
{
if (logger.IsWarn) logger.Warn($"The max batch response body size exceeded. The current response size {totalResponseSize}, and the config setting is JsonRpc.{nameof(jsonRpcConfig.MaxBatchResponseBodySize)} = {jsonRpcConfig.MaxBatchResponseBodySize}");
if (logger.IsWarn) logger.Warn($"The max batch response body size exceeded. The current response size {resultWriter.WrittenCount}, and the config setting is JsonRpc.{nameof(jsonRpcConfig.MaxBatchResponseBodySize)} = {jsonRpcConfig.MaxBatchResponseBodySize}");
enumerator.IsStopped = true;
}
}
Expand Down Expand Up @@ -246,7 +244,6 @@ void SerializeTimeoutException(IJsonRpcService service, IBufferWriter<byte> resu
? new RpcReport("# collection serialization #", handlingTimeMicroseconds, true)
: result.Report.Value, handlingTimeMicroseconds, resultWriter.WrittenCount);

totalResponseSize += resultWriter.WrittenCount;
Interlocked.Add(ref Metrics.JsonRpcBytesSentHttp, resultWriter.WrittenCount);

// There should be only one response because we don't expect multiple JSON tokens in the request
Expand Down