From 7dda8431e860022c47ef3ea9ed7d2f7d71accf75 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 26 Apr 2024 00:27:55 +0000 Subject: [PATCH] Update experiment name --- bazel/experiments.bzl | 2 +- .../ext/transport/chttp2/transport/writing.cc | 8 +++--- src/core/lib/experiments/experiments.cc | 27 +++++++++---------- src/core/lib/experiments/experiments.h | 20 +++++++------- src/core/lib/experiments/experiments.yaml | 2 +- src/core/lib/experiments/rollouts.yaml | 2 +- 6 files changed, 29 insertions(+), 32 deletions(-) diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl index cadb68f74ff..4aa19c24436 100644 --- a/bazel/experiments.bzl +++ b/bazel/experiments.bzl @@ -43,7 +43,7 @@ EXPERIMENT_ENABLES = { "tcp_frame_size_tuning": "tcp_frame_size_tuning", "tcp_rcv_lowat": "tcp_rcv_lowat", "trace_record_callops": "trace_record_callops", - "transfer_headers_to_trailers": "transfer_headers_to_trailers", + "trailers_only_transfer": "trailers_only_transfer", "unconstrained_max_quota_buffer_size": "unconstrained_max_quota_buffer_size", "work_serializer_clears_time_cache": "work_serializer_clears_time_cache", "work_serializer_dispatch": "event_engine_client,work_serializer_dispatch", diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index cc386b0f523..9b4d611a9d3 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -591,9 +591,9 @@ class StreamWriteContext { bool stream_became_writable() { return stream_became_writable_; } private: - class HeaderToTrailersMetadataEncoder { + class TrailersOnlyMetadataEncoder { public: - explicit HeaderToTrailersMetadataEncoder(grpc_metadata_batch* trailing_md) + explicit TrailersOnlyMetadataEncoder(grpc_metadata_batch* trailing_md) : trailing_md_(trailing_md) {} // Non-grpc metadata should not be transferred. @@ -626,8 +626,8 @@ class StreamWriteContext { gpr_log(GPR_INFO, "not sending initial_metadata (Trailers-Only)")); // When sending Trailers-Only, we need to move metadata from headers to // trailers. - if (grpc_core::IsTransferHeadersToTrailersEnabled()) { - HeaderToTrailersMetadataEncoder encoder(s_->send_trailing_metadata); + if (grpc_core::IsTrailersOnlyTransferEnabled()) { + TrailersOnlyMetadataEncoder encoder(s_->send_trailing_metadata); s_->send_initial_metadata->Encode(&encoder); } else { send_status_ = diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index 34a2b555b2f..ec9b0d02a6b 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc @@ -127,9 +127,9 @@ const char* const additional_constraints_tcp_rcv_lowat = "{}"; const char* const description_trace_record_callops = "Enables tracing of call batch initiation and completion."; const char* const additional_constraints_trace_record_callops = "{}"; -const char* const description_transfer_headers_to_trailers = +const char* const description_trailers_only_transfer = "On a trailers-only response, copy most gRPC headers to trailers."; -const char* const additional_constraints_transfer_headers_to_trailers = "{}"; +const char* const additional_constraints_trailers_only_transfer = "{}"; const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = @@ -210,9 +210,8 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true}, {"trace_record_callops", description_trace_record_callops, additional_constraints_trace_record_callops, nullptr, 0, true, true}, - {"transfer_headers_to_trailers", description_transfer_headers_to_trailers, - additional_constraints_transfer_headers_to_trailers, nullptr, 0, true, - true}, + {"trailers_only_transfer", description_trailers_only_transfer, + additional_constraints_trailers_only_transfer, nullptr, 0, true, true}, {"unconstrained_max_quota_buffer_size", description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, @@ -333,9 +332,9 @@ const char* const additional_constraints_tcp_rcv_lowat = "{}"; const char* const description_trace_record_callops = "Enables tracing of call batch initiation and completion."; const char* const additional_constraints_trace_record_callops = "{}"; -const char* const description_transfer_headers_to_trailers = +const char* const description_trailers_only_transfer = "On a trailers-only response, copy most gRPC headers to trailers."; -const char* const additional_constraints_transfer_headers_to_trailers = "{}"; +const char* const additional_constraints_trailers_only_transfer = "{}"; const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = @@ -416,9 +415,8 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true}, {"trace_record_callops", description_trace_record_callops, additional_constraints_trace_record_callops, nullptr, 0, true, true}, - {"transfer_headers_to_trailers", description_transfer_headers_to_trailers, - additional_constraints_transfer_headers_to_trailers, nullptr, 0, true, - true}, + {"trailers_only_transfer", description_trailers_only_transfer, + additional_constraints_trailers_only_transfer, nullptr, 0, true, true}, {"unconstrained_max_quota_buffer_size", description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, @@ -539,9 +537,9 @@ const char* const additional_constraints_tcp_rcv_lowat = "{}"; const char* const description_trace_record_callops = "Enables tracing of call batch initiation and completion."; const char* const additional_constraints_trace_record_callops = "{}"; -const char* const description_transfer_headers_to_trailers = +const char* const description_trailers_only_transfer = "On a trailers-only response, copy most gRPC headers to trailers."; -const char* const additional_constraints_transfer_headers_to_trailers = "{}"; +const char* const additional_constraints_trailers_only_transfer = "{}"; const char* const description_unconstrained_max_quota_buffer_size = "Discard the cap on the max free pool size for one memory allocator"; const char* const additional_constraints_unconstrained_max_quota_buffer_size = @@ -622,9 +620,8 @@ const ExperimentMetadata g_experiment_metadata[] = { additional_constraints_tcp_rcv_lowat, nullptr, 0, false, true}, {"trace_record_callops", description_trace_record_callops, additional_constraints_trace_record_callops, nullptr, 0, true, true}, - {"transfer_headers_to_trailers", description_transfer_headers_to_trailers, - additional_constraints_transfer_headers_to_trailers, nullptr, 0, true, - true}, + {"trailers_only_transfer", description_trailers_only_transfer, + additional_constraints_trailers_only_transfer, nullptr, 0, true, true}, {"unconstrained_max_quota_buffer_size", description_unconstrained_max_quota_buffer_size, additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0, diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index e77d2ed55dc..630575608e4 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h @@ -89,8 +89,8 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; } inline bool IsTcpRcvLowatEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } -#define GRPC_EXPERIMENT_IS_INCLUDED_TRANSFER_HEADERS_TO_TRAILERS -inline bool IsTransferHeadersToTrailersEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_TRAILERS_ONLY_TRANSFER +inline bool IsTrailersOnlyTransferEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } @@ -130,8 +130,8 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; } inline bool IsTcpRcvLowatEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } -#define GRPC_EXPERIMENT_IS_INCLUDED_TRANSFER_HEADERS_TO_TRAILERS -inline bool IsTransferHeadersToTrailersEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_TRAILERS_ONLY_TRANSFER +inline bool IsTrailersOnlyTransferEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } @@ -172,8 +172,8 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; } inline bool IsTcpRcvLowatEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS inline bool IsTraceRecordCallopsEnabled() { return true; } -#define GRPC_EXPERIMENT_IS_INCLUDED_TRANSFER_HEADERS_TO_TRAILERS -inline bool IsTransferHeadersToTrailersEnabled() { return true; } +#define GRPC_EXPERIMENT_IS_INCLUDED_TRAILERS_ONLY_TRANSFER +inline bool IsTrailersOnlyTransferEnabled() { return true; } inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; } @@ -209,7 +209,7 @@ enum ExperimentIds { kExperimentIdTcpFrameSizeTuning, kExperimentIdTcpRcvLowat, kExperimentIdTraceRecordCallops, - kExperimentIdTransferHeadersToTrailers, + kExperimentIdTrailersOnlyTransfer, kExperimentIdUnconstrainedMaxQuotaBufferSize, kExperimentIdWorkSerializerClearsTimeCache, kExperimentIdWorkSerializerDispatch, @@ -319,9 +319,9 @@ inline bool IsTcpRcvLowatEnabled() { inline bool IsTraceRecordCallopsEnabled() { return IsExperimentEnabled(kExperimentIdTraceRecordCallops); } -#define GRPC_EXPERIMENT_IS_INCLUDED_TRANSFER_HEADERS_TO_TRAILERS -inline bool IsTransferHeadersToTrailersEnabled() { - return IsExperimentEnabled(kExperimentIdTransferHeadersToTrailers); +#define GRPC_EXPERIMENT_IS_INCLUDED_TRAILERS_ONLY_TRANSFER +inline bool IsTrailersOnlyTransferEnabled() { + return IsExperimentEnabled(kExperimentIdTrailersOnlyTransfer); } #define GRPC_EXPERIMENT_IS_INCLUDED_UNCONSTRAINED_MAX_QUOTA_BUFFER_SIZE inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml index 3e2ab0ae959..00453855e86 100644 --- a/src/core/lib/experiments/experiments.yaml +++ b/src/core/lib/experiments/experiments.yaml @@ -215,7 +215,7 @@ expiry: 2024/08/01 owner: vigneshbabu@google.com test_tags: [] -- name: transfer_headers_to_trailers +- name: trailers_only_transfer description: On a trailers-only response, copy most gRPC headers to trailers. expiry: 2024/09/30 diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml index 043669bbda3..bc200925367 100644 --- a/src/core/lib/experiments/rollouts.yaml +++ b/src/core/lib/experiments/rollouts.yaml @@ -110,7 +110,7 @@ default: false - name: trace_record_callops default: true -- name: transfer_headers_to_trailers +- name: trailers_only_transfer default: true - name: unconstrained_max_quota_buffer_size default: false