From 149b0273ccb2c4a63650a999c4915cbbcf650ffc Mon Sep 17 00:00:00 2001 From: Biren Roy Date: Thu, 13 Oct 2022 12:40:44 -0400 Subject: [PATCH 1/4] Adds a debug log to help diagnose an issue. Signed-off-by: Biren Roy --- source/common/http/http2/codec_impl.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc index e5bdd8cbd7544..614892750de1d 100644 --- a/source/common/http/http2/codec_impl.cc +++ b/source/common/http/http2/codec_impl.cc @@ -1528,6 +1528,7 @@ Status ConnectionImpl::onStreamClose(StreamImpl* stream, uint32_t error_code) { // Any unconsumed data must be consumed before the stream is deleted. // nghttp2 does not appear to track this internally, and any stream deleted // with outstanding window will contribute to a slow connection-window leak. + ENVOY_CONN_LOG(debug, "Recouping {} bytes of flow control window for stream {}.", parent_.connection_, stream->unconsumed_bytes_, stream_id_); if (use_new_codec_wrapper_) { adapter_->MarkDataConsumedForStream(stream_id, stream->unconsumed_bytes_); stream->unconsumed_bytes_ = 0; From d59007fc525f115442a443d4c28a9ef17599d842 Mon Sep 17 00:00:00 2001 From: Biren Roy Date: Thu, 13 Oct 2022 12:48:39 -0400 Subject: [PATCH 2/4] Updating format. Signed-off-by: Biren Roy --- source/common/http/http2/codec_impl.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc index 614892750de1d..dfe4de5605324 100644 --- a/source/common/http/http2/codec_impl.cc +++ b/source/common/http/http2/codec_impl.cc @@ -1528,7 +1528,8 @@ Status ConnectionImpl::onStreamClose(StreamImpl* stream, uint32_t error_code) { // Any unconsumed data must be consumed before the stream is deleted. // nghttp2 does not appear to track this internally, and any stream deleted // with outstanding window will contribute to a slow connection-window leak. - ENVOY_CONN_LOG(debug, "Recouping {} bytes of flow control window for stream {}.", parent_.connection_, stream->unconsumed_bytes_, stream_id_); + ENVOY_CONN_LOG(debug, "Recouping {} bytes of flow control window for stream {}.", + parent_.connection_, stream->unconsumed_bytes_, stream_id_); if (use_new_codec_wrapper_) { adapter_->MarkDataConsumedForStream(stream_id, stream->unconsumed_bytes_); stream->unconsumed_bytes_ = 0; From 5fdbee375a0a7bec8e5a565e87ffd5f1c2495847 Mon Sep 17 00:00:00 2001 From: Biren Roy Date: Thu, 13 Oct 2022 15:03:03 -0400 Subject: [PATCH 3/4] Fixing build. Signed-off-by: Biren Roy --- source/common/http/http2/codec_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc index dfe4de5605324..d7346000f4634 100644 --- a/source/common/http/http2/codec_impl.cc +++ b/source/common/http/http2/codec_impl.cc @@ -1529,7 +1529,7 @@ Status ConnectionImpl::onStreamClose(StreamImpl* stream, uint32_t error_code) { // nghttp2 does not appear to track this internally, and any stream deleted // with outstanding window will contribute to a slow connection-window leak. ENVOY_CONN_LOG(debug, "Recouping {} bytes of flow control window for stream {}.", - parent_.connection_, stream->unconsumed_bytes_, stream_id_); + connection_, stream->unconsumed_bytes_, stream_id); if (use_new_codec_wrapper_) { adapter_->MarkDataConsumedForStream(stream_id, stream->unconsumed_bytes_); stream->unconsumed_bytes_ = 0; From 475be7fd653c599345ead09b93b3105de82c2491 Mon Sep 17 00:00:00 2001 From: Biren Roy Date: Thu, 13 Oct 2022 15:19:17 -0400 Subject: [PATCH 4/4] Fixing format. Signed-off-by: Biren Roy --- source/common/http/http2/codec_impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc index d7346000f4634..743c775de4044 100644 --- a/source/common/http/http2/codec_impl.cc +++ b/source/common/http/http2/codec_impl.cc @@ -1528,8 +1528,8 @@ Status ConnectionImpl::onStreamClose(StreamImpl* stream, uint32_t error_code) { // Any unconsumed data must be consumed before the stream is deleted. // nghttp2 does not appear to track this internally, and any stream deleted // with outstanding window will contribute to a slow connection-window leak. - ENVOY_CONN_LOG(debug, "Recouping {} bytes of flow control window for stream {}.", - connection_, stream->unconsumed_bytes_, stream_id); + ENVOY_CONN_LOG(debug, "Recouping {} bytes of flow control window for stream {}.", connection_, + stream->unconsumed_bytes_, stream_id); if (use_new_codec_wrapper_) { adapter_->MarkDataConsumedForStream(stream_id, stream->unconsumed_bytes_); stream->unconsumed_bytes_ = 0;