feat postgres: move experiment to config option

commit_hash:37499bbb5d5359ecc46a05670834a9f813c63132

Author: segoon

core/include/userver/utils/impl/userver_experiments.hpp

@@ -58,7 +58,6 @@ extern UserverExperiment kJemallocBgThread;
 extern UserverExperiment kCoroutineStackUsageMonitorExperiment;
 extern UserverExperiment kServerSelectionTimeoutExperiment;
 extern UserverExperiment kPgCcExperiment;
-extern UserverExperiment kPgDeadlinePropagationExperiment;
 extern UserverExperiment kYdbDeadlinePropagationExperiment;
 
 }  // namespace utils::impl

core/src/utils/impl/userver_experiments.cpp

@@ -86,7 +86,6 @@ UserverExperiment kJemallocBgThread{"jemalloc-bg-thread"};
 UserverExperiment kCoroutineStackUsageMonitorExperiment{"coro-stack-usage-monitor"};
 UserverExperiment kServerSelectionTimeoutExperiment{"mongo-server-selection-timeout"};
 UserverExperiment kPgCcExperiment{"pg-cc"};
-UserverExperiment kPgDeadlinePropagationExperiment{"pg-deadline-propagation"};
 UserverExperiment kYdbDeadlinePropagationExperiment{"ydb-deadline-propagation"};
 
 }  // namespace utils::impl

postgresql/functional_tests/basic_chaos/static_config.yaml

@@ -1,7 +1,5 @@
 # yaml
 components_manager:
-    userver_experiments:
-        pg-deadline-propagation: true
     components:
         handler-chaos-postgres:
             path: /chaos/postgres

postgresql/include/userver/storages/postgres/component.hpp

@@ -136,6 +136,7 @@ namespace components {
 /// connecting_limit        | limit for concurrent establishing connections number per pool (0 - unlimited) | 0
 /// connlimit_mode          | max_connections setup mode (manual or auto), also see @ref scripts/docs/en/userver/pg_connlimit_mode_auto.md | auto
 /// error-injection         | artificial error injection settings, error_injection::Settings                | --
+/// deadline-propagation-enabled | whether deadline propagation sets statement timeout                      | true
 
 // clang-format on
 

postgresql/include/userver/storages/postgres/options.hpp

@@ -253,6 +253,8 @@ struct ConnectionSettings {
     /// Execute discard all after establishing a new connection
     DiscardOnConnectOptions discard_on_connect = kDiscardAll;
 
+    bool deadline_propagation_enabled = true;
+
     /// Helps keep track of the changes in settings
     SettingsVersion version{0U};
 

postgresql/src/storages/postgres/component.cpp

@@ -268,6 +268,10 @@ additionalProperties: false
         type: boolean
         description: execute discard all on new connections
         defaultDescription: true
+    deadline-propagation-enabled:
+        type: boolean
+        description: whether statement timeout is affected by deadline propagation
+        defaultDescription: true
     monitoring-dbalias:
         type: string
         description: name of the database for monitorings

postgresql/src/storages/postgres/deadline.cpp

@@ -24,9 +24,6 @@ void CheckDeadlineIsExpired(const dynamic_config::Snapshot& config) {
 
 TimeoutDuration AdjustTimeout(TimeoutDuration timeout, bool& adjusted) {
     adjusted = false;
-    if (!USERVER_NAMESPACE::utils::impl::kPgDeadlinePropagationExperiment.IsEnabled()) {
-        return timeout;
-    }
 
     const auto inherited_deadline = server::request::GetTaskInheritedDeadline();
     if (!inherited_deadline.IsReachable()) return timeout;

postgresql/src/storages/postgres/detail/connection_impl.cpp

@@ -676,7 +676,7 @@ TimeoutDuration ConnectionImpl::CurrentNetworkTimeout() const {
 
 void ConnectionImpl::SetConnectionStatementTimeout(TimeoutDuration timeout, engine::Deadline deadline) {
     timeout = testsuite_pg_ctl_.MakeStatementTimeout(timeout);
-    if (IsPipelineActive()) {
+    if (IsPipelineActive() && settings_.deadline_propagation_enabled) {
         timeout = AdjustTimeout(timeout, deadline_propagation_is_active_);
     }
     if (current_statement_timeout_ != timeout) {
@@ -689,7 +689,7 @@ void ConnectionImpl::SetConnectionStatementTimeout(TimeoutDuration timeout, engi
 
 void ConnectionImpl::SetStatementTimeout(TimeoutDuration timeout, engine::Deadline deadline) {
     timeout = testsuite_pg_ctl_.MakeStatementTimeout(timeout);
-    if (IsPipelineActive()) {
+    if (IsPipelineActive() && settings_.deadline_propagation_enabled) {
         timeout = AdjustTimeout(timeout, deadline_propagation_is_active_);
     }
     if (current_statement_timeout_ != timeout) {

postgresql/src/storages/postgres/postgres_config.cpp

@@ -70,6 +70,7 @@ ConnectionSettings ParseConnectionSettings(const ConfigType& config) {
     settings.discard_on_connect = config["discard-all-on-connect"].template As<bool>(true)
                                       ? ConnectionSettings::kDiscardAll
                                       : ConnectionSettings::kDiscardNone;
+    settings.deadline_propagation_enabled = config["deadline-propagation-enabled"].template As<bool>(true);
 
     return settings;
 }