Skip to content
Snippets Groups Projects
Commit e6bf7d05 authored by Noah Eisen's avatar Noah Eisen Committed by GitHub
Browse files

Merge pull request #10930 from ncteisen/frame-size

Set Frame Size to Bytes per Microsecond
parents e77ba09b 4c427292
No related branches found
No related tags found
No related merge requests found
...@@ -2139,15 +2139,8 @@ static void end_all_the_calls(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, ...@@ -2139,15 +2139,8 @@ static void end_all_the_calls(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
static void update_bdp(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, static void update_bdp(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
double bdp_dbl) { double bdp_dbl) {
int32_t bdp; // initial window size bounded [1,2^31-1], but we set the min to 128.
const int32_t kMinBDP = 128; int32_t bdp = GPR_CLAMP((int32_t)bdp_dbl, 128, INT32_MAX);
if (bdp_dbl <= kMinBDP) {
bdp = kMinBDP;
} else if (bdp_dbl > INT32_MAX) {
bdp = INT32_MAX;
} else {
bdp = (int32_t)(bdp_dbl);
}
int64_t delta = int64_t delta =
(int64_t)bdp - (int64_t)bdp -
(int64_t)t->settings[GRPC_LOCAL_SETTINGS] (int64_t)t->settings[GRPC_LOCAL_SETTINGS]
...@@ -2161,7 +2154,26 @@ static void update_bdp(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t, ...@@ -2161,7 +2154,26 @@ static void update_bdp(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
} }
push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE, push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
(uint32_t)bdp); (uint32_t)bdp);
push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, (uint32_t)bdp); }
static void update_frame(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
double bw_dbl, double bdp_dbl) {
int32_t bdp = GPR_CLAMP((int32_t)bdp_dbl, 128, INT32_MAX);
int32_t target = GPR_MAX((int32_t)bw_dbl / 1000, bdp);
// frame size is bounded [2^14,2^24-1]
int32_t frame_size = GPR_CLAMP(target, 16384, 16777215);
int64_t delta = (int64_t)frame_size -
(int64_t)t->settings[GRPC_LOCAL_SETTINGS]
[GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE];
if (delta == 0 || (delta > -frame_size / 10 && delta < frame_size / 10)) {
return;
}
if (grpc_bdp_estimator_trace) {
gpr_log(GPR_DEBUG, "%s: update max_frame size to %d", t->peer_string,
(int)frame_size);
}
push_setting(exec_ctx, t, GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE,
(uint32_t)frame_size);
} }
static grpc_error *try_http_parsing(grpc_exec_ctx *exec_ctx, static grpc_error *try_http_parsing(grpc_exec_ctx *exec_ctx,
...@@ -2280,6 +2292,7 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp, ...@@ -2280,6 +2292,7 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp,
} }
int64_t estimate = -1; int64_t estimate = -1;
double bdp_guess = -1;
if (grpc_bdp_estimator_get_estimate(&t->bdp_estimator, &estimate)) { if (grpc_bdp_estimator_get_estimate(&t->bdp_estimator, &estimate)) {
double target = 1 + log2((double)estimate); double target = 1 + log2((double)estimate);
double memory_pressure = grpc_resource_quota_get_memory_pressure( double memory_pressure = grpc_resource_quota_get_memory_pressure(
...@@ -2297,9 +2310,15 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp, ...@@ -2297,9 +2310,15 @@ static void read_action_locked(grpc_exec_ctx *exec_ctx, void *tp,
} }
double log2_bdp_guess = double log2_bdp_guess =
grpc_pid_controller_update(&t->pid_controller, bdp_error, dt); grpc_pid_controller_update(&t->pid_controller, bdp_error, dt);
update_bdp(exec_ctx, t, pow(2, log2_bdp_guess)); bdp_guess = pow(2, log2_bdp_guess);
update_bdp(exec_ctx, t, bdp_guess);
t->last_pid_update = now; t->last_pid_update = now;
} }
double bw = -1;
if (grpc_bdp_estimator_get_bw(&t->bdp_estimator, &bw)) {
update_frame(exec_ctx, t, bw, bdp_guess);
}
} }
GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keep_reading"); GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "keep_reading");
} else { } else {
......
...@@ -53,6 +53,11 @@ bool grpc_bdp_estimator_get_estimate(grpc_bdp_estimator *estimator, ...@@ -53,6 +53,11 @@ bool grpc_bdp_estimator_get_estimate(grpc_bdp_estimator *estimator,
return true; return true;
} }
bool grpc_bdp_estimator_get_bw(grpc_bdp_estimator *estimator, double *bw) {
*bw = estimator->bw_est;
return true;
}
bool grpc_bdp_estimator_add_incoming_bytes(grpc_bdp_estimator *estimator, bool grpc_bdp_estimator_add_incoming_bytes(grpc_bdp_estimator *estimator,
int64_t num_bytes) { int64_t num_bytes) {
estimator->accumulator += num_bytes; estimator->accumulator += num_bytes;
......
...@@ -64,6 +64,8 @@ void grpc_bdp_estimator_init(grpc_bdp_estimator *estimator, const char *name); ...@@ -64,6 +64,8 @@ void grpc_bdp_estimator_init(grpc_bdp_estimator *estimator, const char *name);
// Returns true if a reasonable estimate could be obtained // Returns true if a reasonable estimate could be obtained
bool grpc_bdp_estimator_get_estimate(grpc_bdp_estimator *estimator, bool grpc_bdp_estimator_get_estimate(grpc_bdp_estimator *estimator,
int64_t *estimate); int64_t *estimate);
// Returns true if a reasonable estimate could be obtained
bool grpc_bdp_estimator_get_bw(grpc_bdp_estimator *estimator, double *bw);
// Returns true if the user should schedule a ping // Returns true if the user should schedule a ping
bool grpc_bdp_estimator_add_incoming_bytes(grpc_bdp_estimator *estimator, bool grpc_bdp_estimator_add_incoming_bytes(grpc_bdp_estimator *estimator,
int64_t num_bytes); int64_t num_bytes);
......
...@@ -101,6 +101,8 @@ class TrickledCHTTP2 : public EndpointPairFixture { ...@@ -101,6 +101,8 @@ class TrickledCHTTP2 : public EndpointPairFixture {
} }
void AddToLabel(std::ostream& out, benchmark::State& state) { void AddToLabel(std::ostream& out, benchmark::State& state) {
grpc_chttp2_transport* client =
reinterpret_cast<grpc_chttp2_transport*>(client_transport_);
out << " writes/iter:" out << " writes/iter:"
<< ((double)stats_.num_writes / (double)state.iterations()) << ((double)stats_.num_writes / (double)state.iterations())
<< " cli_transport_stalls/iter:" << " cli_transport_stalls/iter:"
...@@ -116,7 +118,8 @@ class TrickledCHTTP2 : public EndpointPairFixture { ...@@ -116,7 +118,8 @@ class TrickledCHTTP2 : public EndpointPairFixture {
(double)state.iterations()) (double)state.iterations())
<< " svr_stream_stalls/iter:" << " svr_stream_stalls/iter:"
<< ((double)server_stats_.streams_stalled_due_to_stream_flow_control / << ((double)server_stats_.streams_stalled_due_to_stream_flow_control /
(double)state.iterations()); (double)state.iterations())
<< " cli_bw_est:" << (double)client->bdp_estimator.bw_est;
} }
void Log(int64_t iteration) { void Log(int64_t iteration) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment