Skip to content

Automated fix for refs/heads/test_785301169 #46

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

Open
github-actions wants to merge 1 commit into
base: test_785301169
Choose a base branch
from
Open

Automated fix for refs/heads/test_785301169 #46

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions src/core/ext/transport/chttp2/transport/http2_client_transport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,7 @@ Http2ClientTransport::Http2ClientTransport(

settings_timeout_ =
channel_args.GetDurationFromIntMillis(GRPC_ARG_SETTINGS_TIMEOUT)
.value_or(std::max(keepalive_timeout_ * 2,
grpc_core::Duration::Minutes(1)));
.value_or(std::max(keepalive_timeout_ * 2, Duration::Minutes(1)));

std::optional<Http2SettingsFrame> settings_frame =
settings_.MaybeSendUpdate();
Expand Down
2 changes: 1 addition & 1 deletion src/core/ext/transport/chttp2/transport/http2_client_transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class Http2ClientTransport final : public ClientTransport {

PromiseEndpoint endpoint_;
Http2SettingsManager settings_;
grpc_core::Duration settings_timeout_;
Duration settings_timeout_;

Http2FrameHeader current_frame_header_;

Expand Down
5 changes: 2 additions & 3 deletions src/core/ext/transport/chttp2/transport/http2_transport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace http2 {
// TODO(tjagtap) : [PH2][P3] : We may not need this file. Delete once Server
// Transport is complete.

void ReadSettingsFromChannelArgs(const grpc_core::ChannelArgs& channel_args,
void ReadSettingsFromChannelArgs(const ChannelArgs& channel_args,
Http2Settings& settings,
const bool is_client) {
int value =
Expand All @@ -68,8 +68,7 @@ void ReadSettingsFromChannelArgs(const grpc_core::ChannelArgs& channel_args,
// Refer to read_channel_args() in chttp2_transport.cc for more details.
}

settings.SetMaxHeaderListSize(
grpc_core::GetHardLimitFromChannelArgs(channel_args));
settings.SetMaxHeaderListSize(GetHardLimitFromChannelArgs(channel_args));

value = channel_args.GetInt(GRPC_ARG_HTTP2_MAX_FRAME_SIZE).value_or(-1);
if (value >= 0) {
Expand Down
4 changes: 2 additions & 2 deletions src/core/ext/transport/chttp2/transport/http2_transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace http2 {
DLOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(http2_ph2_transport))

#define GRPC_HTTP2_COMMON_DLOG \
DLOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(http2_ph2_transport))
DLOG_IF(INFO, GRPC_TRACE_FLAG_ENABLED(http2_ph2_transport))

// Timeout for getting an ack back on settings changes
#define GRPC_ARG_SETTINGS_TIMEOUT "grpc.http2.settings_timeout"
Expand All @@ -64,7 +64,7 @@ enum class HttpStreamState : uint8_t {
kClosed,
};

void ReadSettingsFromChannelArgs(const grpc_core::ChannelArgs& channel_args,
void ReadSettingsFromChannelArgs(const ChannelArgs& channel_args,
Http2Settings& settings, const bool is_client);

void InitLocalSettings(Http2Settings& settings, const bool is_client);
Expand Down