diff options
author | robot-tplatform-ci <robot-tplatform-ci@yandex-team.com> | 2024-01-24 19:29:43 +0300 |
---|---|---|
committer | robot-tplatform-ci <robot-tplatform-ci@yandex-team.com> | 2024-01-24 19:48:21 +0300 |
commit | d8c20af07f90f083d5e3ca61d87864e4dacf6999 (patch) | |
tree | 704eed864d2e0b5f2846fa816054d02966d57e1b /yt | |
parent | 4777dc164b7b05fcff6b8ac5044700dbabcd70ff (diff) | |
download | ydb-d8c20af07f90f083d5e3ca61d87864e4dacf6999.tar.gz |
update taxitool rev. 13295145
update taxitool; ci_url = https://a.yandex-team.ru/projects/automation_group_backend_mlu/ci/releases/flow?dir=taxi%2Ftaxi_tool&id=my-main-release&version=302
Diffstat (limited to 'yt')
-rw-r--r-- | yt/yt/client/api/config.cpp | 2 | ||||
-rw-r--r-- | yt/yt/client/federated/client.cpp | 4 | ||||
-rw-r--r-- | yt/yt/core/concurrency/config.h | 3 | ||||
-rw-r--r-- | yt/yt/core/concurrency/retrying_periodic_executor.h | 2 | ||||
-rw-r--r-- | yt/yt/core/misc/backoff_strategy.cpp | 13 | ||||
-rw-r--r-- | yt/yt/core/misc/backoff_strategy.h | 34 | ||||
-rw-r--r-- | yt/yt/core/misc/backoff_strategy_config.cpp | 44 | ||||
-rw-r--r-- | yt/yt/core/misc/backoff_strategy_config.h | 37 | ||||
-rw-r--r-- | yt/yt/core/misc/config.cpp | 54 | ||||
-rw-r--r-- | yt/yt/core/misc/config.h | 64 | ||||
-rw-r--r-- | yt/yt/core/ya.make | 1 |
11 files changed, 125 insertions, 133 deletions
diff --git a/yt/yt/client/api/config.cpp b/yt/yt/client/api/config.cpp index 404dd8ce95..525819bc07 100644 --- a/yt/yt/client/api/config.cpp +++ b/yt/yt/client/api/config.cpp @@ -1,6 +1,6 @@ #include "config.h" -#include <yt/yt/core/misc/backoff_strategy_config.h> +#include <yt/yt/core/misc/config.h> namespace NYT::NApi { diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp index cd3e0dd5c9..a90d324510 100644 --- a/yt/yt/client/federated/client.cpp +++ b/yt/yt/client/federated/client.cpp @@ -286,6 +286,8 @@ public: TFuture<NYson::TYsonString> ListNode(const NYPath::TYPath&, const TListNodeOptions&) override; TFuture<bool> NodeExists(const NYPath::TYPath&, const TNodeExistsOptions&) override; + TFuture<std::vector<TListQueueConsumerRegistrationsResult>> ListQueueConsumerRegistrations(const std::optional<NYPath::TRichYPath>&, const std::optional<NYPath::TRichYPath>&, const TListQueueConsumerRegistrationsOptions&) override; + const NTabletClient::ITableMountCachePtr& GetTableMountCache() override; TFuture<std::vector<TTabletInfo>> GetTabletInfos(const NYPath::TYPath&, const std::vector<int>&, const TGetTabletInfosOptions&) override; @@ -329,7 +331,6 @@ public: // IClient unsupported methods. UNIMPLEMENTED_METHOD(TFuture<void>, RegisterQueueConsumer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, bool, const TRegisterQueueConsumerOptions&)); UNIMPLEMENTED_METHOD(TFuture<void>, UnregisterQueueConsumer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, const TUnregisterQueueConsumerOptions&)); - UNIMPLEMENTED_METHOD(TFuture<std::vector<TListQueueConsumerRegistrationsResult>>, ListQueueConsumerRegistrations, (const std::optional<NYPath::TRichYPath>&, const std::optional<NYPath::TRichYPath>&, const TListQueueConsumerRegistrationsOptions&)); UNIMPLEMENTED_METHOD(const NChaosClient::IReplicationCardCachePtr&, GetReplicationCardCache, ()); UNIMPLEMENTED_METHOD(TFuture<void>, MountTable, (const NYPath::TYPath&, const TMountTableOptions&)); UNIMPLEMENTED_METHOD(TFuture<void>, UnmountTable, (const NYPath::TYPath&, const TUnmountTableOptions&)); @@ -667,6 +668,7 @@ CLIENT_METHOD_IMPL(NYson::TYsonString, ListNode, (const NYPath::TYPath&, const T CLIENT_METHOD_IMPL(bool, NodeExists, (const NYPath::TYPath&, const TNodeExistsOptions&)); CLIENT_METHOD_IMPL(std::vector<TTabletInfo>, GetTabletInfos, (const NYPath::TYPath&, const std::vector<int>&, const TGetTabletInfosOptions&)); CLIENT_METHOD_IMPL(NChaosClient::TReplicationCardPtr, GetReplicationCard, (NChaosClient::TReplicationCardId, const TGetReplicationCardOptions&)); +CLIENT_METHOD_IMPL(std::vector<TListQueueConsumerRegistrationsResult>, ListQueueConsumerRegistrations, (const std::optional<NYPath::TRichYPath>&, const std::optional<NYPath::TRichYPath>&, const TListQueueConsumerRegistrationsOptions&)); const NTabletClient::ITableMountCachePtr& TClient::GetTableMountCache() { diff --git a/yt/yt/core/concurrency/config.h b/yt/yt/core/concurrency/config.h index 24d5383e60..cc2e007bf1 100644 --- a/yt/yt/core/concurrency/config.h +++ b/yt/yt/core/concurrency/config.h @@ -2,8 +2,7 @@ #include "public.h" -// TODO(arkady-e1ppa): Move backoff config+serialization into core/misc/config.h. -#include <yt/yt/core/misc/backoff_strategy_config.h> +#include <yt/yt/core/misc/config.h> #include <yt/yt/core/ytree/yson_struct.h> diff --git a/yt/yt/core/concurrency/retrying_periodic_executor.h b/yt/yt/core/concurrency/retrying_periodic_executor.h index 2bc1b2f3bf..5bf0182905 100644 --- a/yt/yt/core/concurrency/retrying_periodic_executor.h +++ b/yt/yt/core/concurrency/retrying_periodic_executor.h @@ -6,7 +6,7 @@ #include <yt/yt/core/actions/callback.h> #include <yt/yt/core/actions/future.h> -#include <yt/yt/core/misc/backoff_strategy_config.h> +#include <yt/yt/core/misc/config.h> namespace NYT::NConcurrency { diff --git a/yt/yt/core/misc/backoff_strategy.cpp b/yt/yt/core/misc/backoff_strategy.cpp index 0bb28fdfa4..678a782a4b 100644 --- a/yt/yt/core/misc/backoff_strategy.cpp +++ b/yt/yt/core/misc/backoff_strategy.cpp @@ -20,19 +20,6 @@ double BackoffStrategyDefaultRandomGenerator() //////////////////////////////////////////////////////////////////////////////// -TConstantBackoffOptions::operator TExponentialBackoffOptions() const -{ - return TExponentialBackoffOptions{ - .InvocationCount = InvocationCount, - .MinBackoff = Backoff, - .MaxBackoff = Backoff, - .BackoffMultiplier = 1.0, - .BackoffJitter = BackoffJitter - }; -} - -//////////////////////////////////////////////////////////////////////////////// - TBackoffStrategy::TBackoffStrategy(const TExponentialBackoffOptions& options) : Options_(options) { diff --git a/yt/yt/core/misc/backoff_strategy.h b/yt/yt/core/misc/backoff_strategy.h index 3a05d09354..d8549de65c 100644 --- a/yt/yt/core/misc/backoff_strategy.h +++ b/yt/yt/core/misc/backoff_strategy.h @@ -1,44 +1,12 @@ #pragma once -#include "jitter.h" +#include "config.h" #include "public.h" namespace NYT { //////////////////////////////////////////////////////////////////////////////// -struct TExponentialBackoffOptions -{ - static constexpr int DefaultInvocationCount = 10; - static constexpr auto DefaultMinBackoff = TDuration::Seconds(1); - static constexpr auto DefaultMaxBackoff = TDuration::Seconds(5); - static constexpr double DefaultBackoffMultiplier = 1.5; - static constexpr double DefaultBackoffJitter = 0.1; - - int InvocationCount = DefaultInvocationCount; - TDuration MinBackoff = DefaultMinBackoff; - TDuration MaxBackoff = DefaultMaxBackoff; - double BackoffMultiplier = DefaultBackoffMultiplier; - double BackoffJitter = DefaultBackoffJitter; -}; - -//////////////////////////////////////////////////////////////////////////////// - -struct TConstantBackoffOptions -{ - static constexpr int DefaultInvocationCount = 10; - static constexpr auto DefaultBackoff = TDuration::Seconds(3); - static constexpr double DefaultBackoffJitter = 0.1; - - int InvocationCount = DefaultInvocationCount; - TDuration Backoff = DefaultBackoff; - double BackoffJitter = DefaultBackoffJitter; - - operator TExponentialBackoffOptions() const; -}; - -//////////////////////////////////////////////////////////////////////////////// - //! Implements exponential backoffs with jitter. //! Expected use after restart is Next() -> GetBackoff() (not the other way around). class TBackoffStrategy diff --git a/yt/yt/core/misc/backoff_strategy_config.cpp b/yt/yt/core/misc/backoff_strategy_config.cpp deleted file mode 100644 index 7f02bb9f62..0000000000 --- a/yt/yt/core/misc/backoff_strategy_config.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "backoff_strategy_config.h" - -namespace NYT { - -//////////////////////////////////////////////////////////////////////////////// - -void TExponentialBackoffOptionsSerializer::Register(TRegistrar registrar) -{ - registrar.ExternalClassParameter("invocation_count", &TThat::InvocationCount) - .Alias("retry_count") - .Default(TThat::DefaultInvocationCount); - - registrar.ExternalClassParameter("min_backoff", &TThat::MinBackoff) - .Default(TThat::DefaultMinBackoff); - - registrar.ExternalClassParameter("max_backoff", &TThat::MaxBackoff) - .Default(TThat::DefaultMaxBackoff); - - registrar.ExternalClassParameter("backoff_multiplier", &TThat::BackoffMultiplier) - .Default(TThat::DefaultBackoffMultiplier) - .GreaterThanOrEqual(1.0); - - registrar.ExternalClassParameter("backoff_jitter", &TThat::BackoffJitter) - .Default(TThat::DefaultBackoffJitter); -} - -//////////////////////////////////////////////////////////////////////////////// - -void TConstantBackoffOptionsSerializer::Register(TRegistrar registrar) -{ - registrar.ExternalClassParameter("invocation_count", &TThat::InvocationCount) - .Alias("retry_count") - .Default(TThat::DefaultInvocationCount); - - registrar.ExternalClassParameter("backoff", &TThat::Backoff) - .Default(TThat::DefaultBackoff); - - registrar.ExternalClassParameter("backoff_jitter", &TThat::BackoffJitter) - .Default(TThat::DefaultBackoffJitter); -} - -//////////////////////////////////////////////////////////////////////////////// - -} // namespace NYT diff --git a/yt/yt/core/misc/backoff_strategy_config.h b/yt/yt/core/misc/backoff_strategy_config.h deleted file mode 100644 index 47038589ff..0000000000 --- a/yt/yt/core/misc/backoff_strategy_config.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include "backoff_strategy.h" - -#include <yt/yt/core/ytree/yson_struct.h> - -namespace NYT { - -//////////////////////////////////////////////////////////////////////////////// - -class TExponentialBackoffOptionsSerializer - : public NYTree::TExternalizedYsonStruct -{ -public: - REGISTER_EXTERNALIZED_YSON_STRUCT(TExponentialBackoffOptions, TExponentialBackoffOptionsSerializer); - - static void Register(TRegistrar registrar); -}; - -ASSIGN_EXTERNAL_YSON_SERIALIZER(TExponentialBackoffOptions, TExponentialBackoffOptionsSerializer); - -//////////////////////////////////////////////////////////////////////////////// - -class TConstantBackoffOptionsSerializer - : public NYTree::TExternalizedYsonStruct -{ -public: - REGISTER_EXTERNALIZED_YSON_STRUCT(TConstantBackoffOptions, TConstantBackoffOptionsSerializer); - - static void Register(TRegistrar registrar); -}; - -ASSIGN_EXTERNAL_YSON_SERIALIZER(TConstantBackoffOptions, TConstantBackoffOptionsSerializer); - -//////////////////////////////////////////////////////////////////////////////// - -} // namespace NYT diff --git a/yt/yt/core/misc/config.cpp b/yt/yt/core/misc/config.cpp index a33279b9b0..c888012afe 100644 --- a/yt/yt/core/misc/config.cpp +++ b/yt/yt/core/misc/config.cpp @@ -4,6 +4,19 @@ namespace NYT { //////////////////////////////////////////////////////////////////////////////// +TConstantBackoffOptions::operator TExponentialBackoffOptions() const +{ + return TExponentialBackoffOptions{ + .InvocationCount = InvocationCount, + .MinBackoff = Backoff, + .MaxBackoff = Backoff, + .BackoffMultiplier = 1.0, + .BackoffJitter = BackoffJitter + }; +} + +//////////////////////////////////////////////////////////////////////////////// + void TLogDigestConfig::Register(TRegistrar registrar) { registrar.Parameter("relative_precision", &TThis::RelativePrecision) @@ -128,4 +141,45 @@ void TAdaptiveHedgingManagerConfig::Register(TRegistrar registrar) //////////////////////////////////////////////////////////////////////////////// +namespace NDetail { + +void TExponentialBackoffOptionsSerializer::Register(TRegistrar registrar) +{ + registrar.ExternalClassParameter("invocation_count", &TThat::InvocationCount) + .Alias("retry_count") + .Default(TThat::DefaultInvocationCount); + + registrar.ExternalClassParameter("min_backoff", &TThat::MinBackoff) + .Default(TThat::DefaultMinBackoff); + + registrar.ExternalClassParameter("max_backoff", &TThat::MaxBackoff) + .Default(TThat::DefaultMaxBackoff); + + registrar.ExternalClassParameter("backoff_multiplier", &TThat::BackoffMultiplier) + .Default(TThat::DefaultBackoffMultiplier) + .GreaterThanOrEqual(1.0); + + registrar.ExternalClassParameter("backoff_jitter", &TThat::BackoffJitter) + .Default(TThat::DefaultBackoffJitter); +} + +//////////////////////////////////////////////////////////////////////////////// + +void TConstantBackoffOptionsSerializer::Register(TRegistrar registrar) +{ + registrar.ExternalClassParameter("invocation_count", &TThat::InvocationCount) + .Alias("retry_count") + .Default(TThat::DefaultInvocationCount); + + registrar.ExternalClassParameter("backoff", &TThat::Backoff) + .Default(TThat::DefaultBackoff); + + registrar.ExternalClassParameter("backoff_jitter", &TThat::BackoffJitter) + .Default(TThat::DefaultBackoffJitter); +} + +} // namespace NDetail + +//////////////////////////////////////////////////////////////////////////////// + } // namespace NYT diff --git a/yt/yt/core/misc/config.h b/yt/yt/core/misc/config.h index bf10114bf0..70b17362d0 100644 --- a/yt/yt/core/misc/config.h +++ b/yt/yt/core/misc/config.h @@ -10,6 +10,38 @@ namespace NYT { //////////////////////////////////////////////////////////////////////////////// +struct TExponentialBackoffOptions +{ + static constexpr int DefaultInvocationCount = 10; + static constexpr auto DefaultMinBackoff = TDuration::Seconds(1); + static constexpr auto DefaultMaxBackoff = TDuration::Seconds(5); + static constexpr double DefaultBackoffMultiplier = 1.5; + static constexpr double DefaultBackoffJitter = 0.1; + + int InvocationCount = DefaultInvocationCount; + TDuration MinBackoff = DefaultMinBackoff; + TDuration MaxBackoff = DefaultMaxBackoff; + double BackoffMultiplier = DefaultBackoffMultiplier; + double BackoffJitter = DefaultBackoffJitter; +}; + +//////////////////////////////////////////////////////////////////////////////// + +struct TConstantBackoffOptions +{ + static constexpr int DefaultInvocationCount = 10; + static constexpr auto DefaultBackoff = TDuration::Seconds(3); + static constexpr double DefaultBackoffJitter = 0.1; + + int InvocationCount = DefaultInvocationCount; + TDuration Backoff = DefaultBackoff; + double BackoffJitter = DefaultBackoffJitter; + + operator TExponentialBackoffOptions() const; +}; + +//////////////////////////////////////////////////////////////////////////////// + class TLogDigestConfig : public NYTree::TYsonStruct { @@ -114,4 +146,36 @@ DEFINE_REFCOUNTED_TYPE(TAdaptiveHedgingManagerConfig) //////////////////////////////////////////////////////////////////////////////// +namespace NDetail { + +class TExponentialBackoffOptionsSerializer + : public NYTree::TExternalizedYsonStruct +{ +public: + REGISTER_EXTERNALIZED_YSON_STRUCT(TExponentialBackoffOptions, TExponentialBackoffOptionsSerializer); + + static void Register(TRegistrar registrar); +}; + + +//////////////////////////////////////////////////////////////////////////////// + +class TConstantBackoffOptionsSerializer + : public NYTree::TExternalizedYsonStruct +{ +public: + REGISTER_EXTERNALIZED_YSON_STRUCT(TConstantBackoffOptions, TConstantBackoffOptionsSerializer); + + static void Register(TRegistrar registrar); +}; + + + +} // namespace NDetail + +//////////////////////////////////////////////////////////////////////////////// + } // namespace NYT + +ASSIGN_EXTERNAL_YSON_SERIALIZER(NYT::TExponentialBackoffOptions, NYT::NDetail::TExponentialBackoffOptionsSerializer); +ASSIGN_EXTERNAL_YSON_SERIALIZER(NYT::TConstantBackoffOptions, NYT::NDetail::TConstantBackoffOptionsSerializer); diff --git a/yt/yt/core/ya.make b/yt/yt/core/ya.make index fe08f07e71..5bd8822192 100644 --- a/yt/yt/core/ya.make +++ b/yt/yt/core/ya.make @@ -107,7 +107,6 @@ SRCS( misc/arithmetic_formula.cpp GLOBAL misc/assert.cpp misc/backoff_strategy.cpp - misc/backoff_strategy_config.cpp misc/bitmap.cpp misc/bit_packed_unsigned_vector.cpp misc/bit_packing.cpp |