Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[experiments] Remove flow_control_fixes experiment (#33230)

Browse Source 
We defaulted this on 5 months ago, and it seems to be working... let's
remove the experiment bit!

---------

Co-authored-by: ctiller <ctiller@users.noreply.github.com>
pull/33228/head^2
Craig Tiller 2 years ago committed by GitHub
parent 33d0afd316
commit ad3c6273c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      bazel/experiments.bzl
  2. 136
      src/core/ext/transport/chttp2/transport/flow_control.cc
  3. 3
      src/core/lib/experiments/experiments.cc
  4. 40
      src/core/lib/experiments/experiments.h
  5. 6
      src/core/lib/experiments/experiments.yaml

3
bazel/experiments.bzl generated
Unescape View File

@ -61,9 +61,6 @@ EXPERIMENTS = {
],
},
"on": {
"flow_control_test": [
"flow_control_fixes",
],
},
"opt": {
},

136
src/core/ext/transport/chttp2/transport/flow_control.cc
Unescape View File

@ -21,7 +21,6 @@
#include "src/core/ext/transport/chttp2/transport/flow_control.h"
#include <inttypes.h>
#include <limits.h>
#include <algorithm>
#include <cmath>
@ -278,45 +277,33 @@ void TransportFlowControl::UpdateSetting(
uint32_t new_desired_value, FlowControlAction* action,
FlowControlAction& (FlowControlAction::*set)(FlowControlAction::Urgency,
uint32_t)) {
if (IsFlowControlFixesEnabled()) {
new_desired_value =
Clamp(new_desired_value, grpc_chttp2_settings_parameters[id].min_value,
grpc_chttp2_settings_parameters[id].max_value);
if (new_desired_value != *desired_value) {
if (grpc_flowctl_trace.enabled()) {
gpr_log(GPR_INFO, "[flowctl] UPDATE SETTING %s from %" PRId64 " to %d",
grpc_chttp2_settings_parameters[id].name, *desired_value,
new_desired_value);
}
// Reaching zero can only happen for initial window size, and if it occurs
// we really want to wake up writes and ensure all the queued stream
// window updates are flushed, since stream flow control operates
// differently at zero window size.
FlowControlAction::Urgency urgency =
FlowControlAction::Urgency::QUEUE_UPDATE;
if (*desired_value == 0 || new_desired_value == 0) {
urgency = FlowControlAction::Urgency::UPDATE_IMMEDIATELY;
}
*desired_value = new_desired_value;
(action->*set)(urgency, *desired_value);
new_desired_value =
Clamp(new_desired_value, grpc_chttp2_settings_parameters[id].min_value,
grpc_chttp2_settings_parameters[id].max_value);
if (new_desired_value != *desired_value) {
if (grpc_flowctl_trace.enabled()) {
gpr_log(GPR_INFO, "[flowctl] UPDATE SETTING %s from %" PRId64 " to %d",
grpc_chttp2_settings_parameters[id].name, *desired_value,
new_desired_value);
}
} else {
int64_t delta = new_desired_value - *desired_value;
// TODO(ncteisen): tune this
if (delta != 0 &&
(delta <= -*desired_value / 5 || delta >= *desired_value / 5)) {
*desired_value = new_desired_value;
(action->*set)(FlowControlAction::Urgency::QUEUE_UPDATE,
static_cast<uint32_t>(*desired_value));
// Reaching zero can only happen for initial window size, and if it occurs
// we really want to wake up writes and ensure all the queued stream
// window updates are flushed, since stream flow control operates
// differently at zero window size.
FlowControlAction::Urgency urgency =
FlowControlAction::Urgency::QUEUE_UPDATE;
if (*desired_value == 0 || new_desired_value == 0) {
urgency = FlowControlAction::Urgency::UPDATE_IMMEDIATELY;
}
*desired_value = new_desired_value;
(action->*set)(urgency, *desired_value);
}
}
FlowControlAction TransportFlowControl::SetAckedInitialWindow(uint32_t value) {
acked_init_window_ = value;
FlowControlAction action;
if (IsFlowControlFixesEnabled() &&
acked_init_window_ != target_initial_window_size_) {
if (acked_init_window_ != target_initial_window_size_) {
FlowControlAction::Urgency urgency =
FlowControlAction::Urgency::QUEUE_UPDATE;
if (acked_init_window_ == 0 || target_initial_window_size_ == 0) {
@ -330,68 +317,31 @@ FlowControlAction TransportFlowControl::SetAckedInitialWindow(uint32_t value) {
FlowControlAction TransportFlowControl::PeriodicUpdate() {
FlowControlAction action;
if (enable_bdp_probe_) {
if (IsFlowControlFixesEnabled()) {
// get bdp estimate and update initial_window accordingly.
// target might change based on how much memory pressure we are under
// TODO(ncteisen): experiment with setting target to be huge under low
// memory pressure.
uint32_t target = static_cast<uint32_t>(RoundUpToPowerOf2(
Clamp(IsMemoryPressureControllerEnabled()
? TargetInitialWindowSizeBasedOnMemoryPressureAndBdp()
: pow(2, SmoothLogBdp(TargetLogBdp())),
0.0, static_cast<double>(kMaxInitialWindowSize))));
if (target < kMinPositiveInitialWindowSize) target = 0;
if (g_test_only_transport_target_window_estimates_mocker != nullptr) {
// Hook for simulating unusual flow control situations in tests.
target = g_test_only_transport_target_window_estimates_mocker
->ComputeNextTargetInitialWindowSizeFromPeriodicUpdate(
target_initial_window_size_ /* current target */);
}
// Though initial window 'could' drop to 0, we keep the floor at
// kMinInitialWindowSize
UpdateSetting(GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
&target_initial_window_size_, target, &action,
&FlowControlAction::set_send_initial_window_update);
// we target the max of BDP or bandwidth in microseconds.
UpdateSetting(GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, &target_frame_size_,
target, &action,
&FlowControlAction::set_send_max_frame_size_update);
} else {
// get bdp estimate and update initial_window accordingly.
// target might change based on how much memory pressure we are under
// TODO(ncteisen): experiment with setting target to be huge under low
// memory pressure.
double target = IsMemoryPressureControllerEnabled()
? TargetInitialWindowSizeBasedOnMemoryPressureAndBdp()
: pow(2, SmoothLogBdp(TargetLogBdp()));
if (g_test_only_transport_target_window_estimates_mocker != nullptr) {
// Hook for simulating unusual flow control situations in tests.
target = g_test_only_transport_target_window_estimates_mocker
->ComputeNextTargetInitialWindowSizeFromPeriodicUpdate(
target_initial_window_size_ /* current target */);
}
// Though initial window 'could' drop to 0, we keep the floor at
// kMinInitialWindowSize
UpdateSetting(GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
&target_initial_window_size_,
static_cast<int32_t>(Clamp(
target, static_cast<double>(kMinInitialWindowSize),
static_cast<double>(kMaxInitialWindowSize))),
&action,
&FlowControlAction::set_send_initial_window_update);
// get bandwidth estimate and update max_frame accordingly.
double bw_dbl = bdp_estimator_.EstimateBandwidth();
// we target the max of BDP or bandwidth in microseconds.
UpdateSetting(
GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, &target_frame_size_,
static_cast<int32_t>(
Clamp(std::max(static_cast<int32_t>(Clamp(
bw_dbl, 0.0, static_cast<double>(INT_MAX))) /
1000,
static_cast<int32_t>(target_initial_window_size_)),
16384, 16777215)),
&action, &FlowControlAction::set_send_max_frame_size_update);
// get bdp estimate and update initial_window accordingly.
// target might change based on how much memory pressure we are under
// TODO(ncteisen): experiment with setting target to be huge under low
// memory pressure.
uint32_t target = static_cast<uint32_t>(RoundUpToPowerOf2(
Clamp(IsMemoryPressureControllerEnabled()
? TargetInitialWindowSizeBasedOnMemoryPressureAndBdp()
: pow(2, SmoothLogBdp(TargetLogBdp())),
0.0, static_cast<double>(kMaxInitialWindowSize))));
if (target < kMinPositiveInitialWindowSize) target = 0;
if (g_test_only_transport_target_window_estimates_mocker != nullptr) {
// Hook for simulating unusual flow control situations in tests.
target = g_test_only_transport_target_window_estimates_mocker
->ComputeNextTargetInitialWindowSizeFromPeriodicUpdate(
target_initial_window_size_ /* current target */);
}
// Though initial window 'could' drop to 0, we keep the floor at
// kMinInitialWindowSize
UpdateSetting(GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
&target_initial_window_size_, target, &action,
&FlowControlAction::set_send_initial_window_update);
// we target the max of BDP or bandwidth in microseconds.
UpdateSetting(GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE, &target_frame_size_,
target, &action,
&FlowControlAction::set_send_max_frame_size_update);
if (IsTcpFrameSizeTuningEnabled()) {
// Advertise PREFERRED_RECEIVE_CRYPTO_FRAME_SIZE to peer. By advertising

3
src/core/lib/experiments/experiments.cc
Unescape View File

@ -31,8 +31,6 @@ const char* const description_peer_state_based_framing =
"If set, the max sizes of frames sent to lower layers is controlled based "
"on the peer's memory pressure which is reflected in its max http2 frame "
"size.";
const char* const description_flow_control_fixes =
"Various fixes for flow control, max frame size setting.";
const char* const description_memory_pressure_controller =
"New memory pressure controller";
const char* const description_unconstrained_max_quota_buffer_size =
@ -75,7 +73,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
{"tcp_rcv_lowat", description_tcp_rcv_lowat, false, true},
{"peer_state_based_framing", description_peer_state_based_framing, false,
true},
{"flow_control_fixes", description_flow_control_fixes, true, true},
{"memory_pressure_controller", description_memory_pressure_controller,
false, true},
{"unconstrained_max_quota_buffer_size",

40
src/core/lib/experiments/experiments.h
Unescape View File

@ -60,8 +60,6 @@ namespace grpc_core {
inline bool IsTcpFrameSizeTuningEnabled() { return false; }
inline bool IsTcpRcvLowatEnabled() { return false; }
inline bool IsPeerStateBasedFramingEnabled() { return false; }
#define GRPC_EXPERIMENT_IS_INCLUDED_FLOW_CONTROL_FIXES
inline bool IsFlowControlFixesEnabled() { return true; }
inline bool IsMemoryPressureControllerEnabled() { return false; }
inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
inline bool IsEventEngineClientEnabled() { return false; }
@ -86,52 +84,48 @@ inline bool IsTcpFrameSizeTuningEnabled() { return IsExperimentEnabled(0); }
inline bool IsTcpRcvLowatEnabled() { return IsExperimentEnabled(1); }
#define GRPC_EXPERIMENT_IS_INCLUDED_PEER_STATE_BASED_FRAMING
inline bool IsPeerStateBasedFramingEnabled() { return IsExperimentEnabled(2); }
#define GRPC_EXPERIMENT_IS_INCLUDED_FLOW_CONTROL_FIXES
inline bool IsFlowControlFixesEnabled() { return IsExperimentEnabled(3); }
#define GRPC_EXPERIMENT_IS_INCLUDED_MEMORY_PRESSURE_CONTROLLER
inline bool IsMemoryPressureControllerEnabled() {
return IsExperimentEnabled(4);
return IsExperimentEnabled(3);
}
#define GRPC_EXPERIMENT_IS_INCLUDED_UNCONSTRAINED_MAX_QUOTA_BUFFER_SIZE
inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() {
return IsExperimentEnabled(5);
return IsExperimentEnabled(4);
}
#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
inline bool IsEventEngineClientEnabled() { return IsExperimentEnabled(6); }
inline bool IsEventEngineClientEnabled() { return IsExperimentEnabled(5); }
#define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
inline bool IsMonitoringExperimentEnabled() { return IsExperimentEnabled(7); }
inline bool IsMonitoringExperimentEnabled() { return IsExperimentEnabled(6); }
#define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_CLIENT_CALL
inline bool IsPromiseBasedClientCallEnabled() { return IsExperimentEnabled(8); }
inline bool IsPromiseBasedClientCallEnabled() { return IsExperimentEnabled(7); }
#define GRPC_EXPERIMENT_IS_INCLUDED_FREE_LARGE_ALLOCATOR
inline bool IsFreeLargeAllocatorEnabled() { return IsExperimentEnabled(9); }
inline bool IsFreeLargeAllocatorEnabled() { return IsExperimentEnabled(8); }
#define GRPC_EXPERIMENT_IS_INCLUDED_PROMISE_BASED_SERVER_CALL
inline bool IsPromiseBasedServerCallEnabled() {
return IsExperimentEnabled(10);
}
inline bool IsPromiseBasedServerCallEnabled() { return IsExperimentEnabled(9); }
#define GRPC_EXPERIMENT_IS_INCLUDED_TRANSPORT_SUPPLIES_CLIENT_LATENCY
inline bool IsTransportSuppliesClientLatencyEnabled() {
return IsExperimentEnabled(11);
return IsExperimentEnabled(10);
}
#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
inline bool IsEventEngineListenerEnabled() { return IsExperimentEnabled(12); }
inline bool IsEventEngineListenerEnabled() { return IsExperimentEnabled(11); }
#define GRPC_EXPERIMENT_IS_INCLUDED_SCHEDULE_CANCELLATION_OVER_WRITE
inline bool IsScheduleCancellationOverWriteEnabled() {
return IsExperimentEnabled(13);
return IsExperimentEnabled(12);
}
#define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
inline bool IsTraceRecordCallopsEnabled() { return IsExperimentEnabled(14); }
inline bool IsTraceRecordCallopsEnabled() { return IsExperimentEnabled(13); }
#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
inline bool IsEventEngineDnsEnabled() { return IsExperimentEnabled(15); }
inline bool IsEventEngineDnsEnabled() { return IsExperimentEnabled(14); }
#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_STEALING
inline bool IsWorkStealingEnabled() { return IsExperimentEnabled(16); }
inline bool IsWorkStealingEnabled() { return IsExperimentEnabled(15); }
#define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_PRIVACY
inline bool IsClientPrivacyEnabled() { return IsExperimentEnabled(17); }
inline bool IsClientPrivacyEnabled() { return IsExperimentEnabled(16); }
#define GRPC_EXPERIMENT_IS_INCLUDED_CANARY_CLIENT_PRIVACY
inline bool IsCanaryClientPrivacyEnabled() { return IsExperimentEnabled(18); }
inline bool IsCanaryClientPrivacyEnabled() { return IsExperimentEnabled(17); }
#define GRPC_EXPERIMENT_IS_INCLUDED_SERVER_PRIVACY
inline bool IsServerPrivacyEnabled() { return IsExperimentEnabled(19); }
inline bool IsServerPrivacyEnabled() { return IsExperimentEnabled(18); }
constexpr const size_t kNumExperiments = 20;
constexpr const size_t kNumExperiments = 19;
extern const ExperimentMetadata g_experiment_metadata[kNumExperiments];
#endif

6
src/core/lib/experiments/experiments.yaml
Unescape View File

@ -64,12 +64,6 @@
expiry: 2023/06/01
owner: vigneshbabu@google.com
test_tags: ["flow_control_test"]
- name: flow_control_fixes
description: Various fixes for flow control, max frame size setting.
default: true
expiry: 2023/06/01
owner: ctiller@google.com
test_tags: ["flow_control_test"]
- name: memory_pressure_controller
description: New memory pressure controller
default: false

Write Preview
Loading…
Cancel
Save