Automated change: Fix sanity tests
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc index f1eef98..01ac5c0 100644 --- a/src/core/lib/experiments/experiments.cc +++ b/src/core/lib/experiments/experiments.cc
@@ -183,11 +183,6 @@ "Change WRR code to delegate to pick_first as per dualstack backend " "design."; const char* const additional_constraints_wrr_delegate_to_pick_first = "{}"; -#ifdef NDEBUG -const bool kDefaultForDebugOnly = false; -#else -const bool kDefaultForDebugOnly = true; -#endif } // namespace namespace grpc_core { @@ -196,7 +191,7 @@ {"call_status_override_on_cancellation", description_call_status_override_on_cancellation, additional_constraints_call_status_override_on_cancellation, nullptr, 0, - kDefaultForDebugOnly, true}, + false, true}, {"call_v3", description_call_v3, additional_constraints_call_v3, nullptr, 0, false, true}, {"canary_client_privacy", description_canary_client_privacy, @@ -456,11 +451,6 @@ "Change WRR code to delegate to pick_first as per dualstack backend " "design."; const char* const additional_constraints_wrr_delegate_to_pick_first = "{}"; -#ifdef NDEBUG -const bool kDefaultForDebugOnly = false; -#else -const bool kDefaultForDebugOnly = true; -#endif } // namespace namespace grpc_core { @@ -469,7 +459,7 @@ {"call_status_override_on_cancellation", description_call_status_override_on_cancellation, additional_constraints_call_status_override_on_cancellation, nullptr, 0, - kDefaultForDebugOnly, true}, + false, true}, {"call_v3", description_call_v3, additional_constraints_call_v3, nullptr, 0, false, true}, {"canary_client_privacy", description_canary_client_privacy, @@ -729,11 +719,6 @@ "Change WRR code to delegate to pick_first as per dualstack backend " "design."; const char* const additional_constraints_wrr_delegate_to_pick_first = "{}"; -#ifdef NDEBUG -const bool kDefaultForDebugOnly = false; -#else -const bool kDefaultForDebugOnly = true; -#endif } // namespace namespace grpc_core { @@ -742,7 +727,7 @@ {"call_status_override_on_cancellation", description_call_status_override_on_cancellation, additional_constraints_call_status_override_on_cancellation, nullptr, 0, - kDefaultForDebugOnly, true}, + false, true}, {"call_v3", description_call_v3, additional_constraints_call_v3, nullptr, 0, false, true}, {"canary_client_privacy", description_canary_client_privacy,
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h index 778a99f..08ec128 100644 --- a/src/core/lib/experiments/experiments.h +++ b/src/core/lib/experiments/experiments.h
@@ -57,16 +57,7 @@ #ifdef GRPC_EXPERIMENTS_ARE_FINAL #if defined(GRPC_CFSTREAM) -#ifndef NDEBUG -#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION -#endif -inline bool IsCallStatusOverrideOnCancellationEnabled() { -#ifdef NDEBUG - return false; -#else - return true; -#endif -} +inline bool IsCallStatusOverrideOnCancellationEnabled() { return false; } inline bool IsCallV3Enabled() { return false; } inline bool IsCanaryClientPrivacyEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS @@ -119,16 +110,7 @@ inline bool IsWrrDelegateToPickFirstEnabled() { return true; } #elif defined(GPR_WINDOWS) -#ifndef NDEBUG -#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION -#endif -inline bool IsCallStatusOverrideOnCancellationEnabled() { -#ifdef NDEBUG - return false; -#else - return true; -#endif -} +inline bool IsCallStatusOverrideOnCancellationEnabled() { return false; } inline bool IsCallV3Enabled() { return false; } inline bool IsCanaryClientPrivacyEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS @@ -182,16 +164,7 @@ inline bool IsWrrDelegateToPickFirstEnabled() { return true; } #else -#ifndef NDEBUG -#define GRPC_EXPERIMENT_IS_INCLUDED_CALL_STATUS_OVERRIDE_ON_CANCELLATION -#endif -inline bool IsCallStatusOverrideOnCancellationEnabled() { -#ifdef NDEBUG - return false; -#else - return true; -#endif -} +inline bool IsCallStatusOverrideOnCancellationEnabled() { return false; } inline bool IsCallV3Enabled() { return false; } inline bool IsCanaryClientPrivacyEnabled() { return false; } #define GRPC_EXPERIMENT_IS_INCLUDED_CLIENT_IDLENESS