From 029916779a98f0ffba1bf7bdce236e9b3d2d6e3b Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Thu, 14 Sep 2023 10:48:47 +0300 Subject: [PATCH] update userver submodule --- CMakeLists.txt | 2 +- configs/dynamic_config_fallback.json | 7 ++----- tests/requirements.txt | 3 ++- third_party/userver | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 449d763..426b684 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(${PROJECT_NAME}_objs OBJECT src/hello.hpp src/hello.cpp ) -target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver-core userver-postgresql) +target_link_libraries(${PROJECT_NAME}_objs PUBLIC userver-postgresql) # The Service diff --git a/configs/dynamic_config_fallback.json b/configs/dynamic_config_fallback.json index 0f5bb0e..662150b 100644 --- a/configs/dynamic_config_fallback.json +++ b/configs/dynamic_config_fallback.json @@ -2,6 +2,7 @@ "USERVER_CACHES": {}, "USERVER_CANCEL_HANDLE_REQUEST_BY_DEADLINE": false, "USERVER_CHECK_AUTH_IN_HANDLERS": false, + "USERVER_DEADLINE_PROPAGATION_ENABLED": true, "USERVER_DUMPS": {}, "USERVER_HTTP_PROXY": "", "USERVER_HANDLER_STREAM_API_ENABLED": false, @@ -19,10 +20,6 @@ "per-host-limit": 3000, "per-host-per-second": 500 }, - "HTTP_CLIENT_ENFORCE_TASK_DEADLINE": { - "cancel-request": false, - "update-timeout": false - }, "BAGGAGE_SETTINGS": { "allowed_keys": [] }, @@ -63,7 +60,7 @@ "POSTGRES_CONNLIMIT_MODE_AUTO_ENABLED": false, "POSTGRES_CONNECTION_PIPELINE_EXPERIMENT": 0, "POSTGRES_CONGESTION_CONTROL_SETTINGS": {}, - "POSTGRES_DEADLINE_PROPAGATION_VERSION": 0, + "POSTGRES_DEADLINE_PROPAGATION_VERSION": 1, "POSTGRES_STATEMENT_METRICS_SETTINGS": { "postgres-db-1": { "max_statement_metrics": 5 diff --git a/tests/requirements.txt b/tests/requirements.txt index 1c4f244..3fdc85f 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1 +1,2 @@ -yandex-taxi-testsuite[postgresql-binary] >= 0.1.7.2 +yandex-taxi-testsuite[postgresql-binary] >= 0.1.17 +websockets >= 11.0.3 diff --git a/third_party/userver b/third_party/userver index ef6cd42..1261055 160000 --- a/third_party/userver +++ b/third_party/userver @@ -1 +1 @@ -Subproject commit ef6cd42b3fd530b97c609ad5c5487924632b855c +Subproject commit 1261055101b13896fa3e732be234aa2d431c48ff