diff options
author | innokentii <innokentii@yandex-team.com> | 2023-09-12 18:49:46 +0300 |
---|---|---|
committer | innokentii <innokentii@yandex-team.com> | 2023-09-12 19:46:46 +0300 |
commit | be91e8f9ba33b8003f61826afea0286f7674f148 (patch) | |
tree | ad7995684e6ffd86f8dffe560d90f3d9678546f7 | |
parent | 3c0e6f878bc910f07298391b0944cd6d90a265ea (diff) | |
download | ydb-be91e8f9ba33b8003f61826afea0286f7674f148.tar.gz |
Fix typo in word hierarchical
fix typo
-rw-r--r-- | ydb/core/grpc_services/rpc_rate_limiter_api.cpp | 4 | ||||
-rw-r--r-- | ydb/core/kesus/tablet/quoter_resource_tree.cpp | 92 | ||||
-rw-r--r-- | ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp | 12 | ||||
-rw-r--r-- | ydb/core/kesus/tablet/rate_accounting.cpp | 2 | ||||
-rw-r--r-- | ydb/core/kesus/tablet/tablet_ut.cpp | 52 | ||||
-rw-r--r-- | ydb/core/kesus/tablet/tx_quoter_resource_add.cpp | 6 | ||||
-rw-r--r-- | ydb/core/kesus/tablet/tx_quoter_resource_update.cpp | 4 | ||||
-rw-r--r-- | ydb/core/kesus/tablet/ut_helpers.cpp | 6 | ||||
-rw-r--r-- | ydb/core/protos/kesus.proto | 4 | ||||
-rw-r--r-- | ydb/core/quoter/kesus_quoter_proxy.cpp | 4 | ||||
-rw-r--r-- | ydb/core/quoter/kesus_quoter_ut.cpp | 4 | ||||
-rw-r--r-- | ydb/core/quoter/quoter_service_bandwidth_test/server.cpp | 2 | ||||
-rw-r--r-- | ydb/core/quoter/quoter_service_ut.cpp | 2 | ||||
-rw-r--r-- | ydb/core/quoter/ut_helpers.cpp | 2 | ||||
-rw-r--r-- | ydb/core/testlib/test_client.cpp | 2 | ||||
-rw-r--r-- | ydb/core/ymq/actor/queue_schema.cpp | 2 | ||||
-rw-r--r-- | ydb/core/ymq/actor/schema.cpp | 2 |
17 files changed, 101 insertions, 101 deletions
diff --git a/ydb/core/grpc_services/rpc_rate_limiter_api.cpp b/ydb/core/grpc_services/rpc_rate_limiter_api.cpp index ba48473032..5e42e9679b 100644 --- a/ydb/core/grpc_services/rpc_rate_limiter_api.cpp +++ b/ydb/core/grpc_services/rpc_rate_limiter_api.cpp @@ -206,7 +206,7 @@ protected: static void CopyProps(const Ydb::RateLimiter::Resource& src, NKikimrKesus::TStreamingQuoterResource& dst) { dst.SetResourcePath(src.resource_path()); const auto& srcProps = src.hierarchical_drr(); - auto& props = *dst.MutableHierarhicalDRRResourceConfig(); + auto& props = *dst.MutableHierarchicalDRRResourceConfig(); props.SetMaxUnitsPerSecond(srcProps.max_units_per_second()); props.SetMaxBurstSizeCoefficient(srcProps.max_burst_size_coefficient()); props.SetPrefetchCoefficient(srcProps.prefetch_coefficient()); @@ -215,7 +215,7 @@ static void CopyProps(const Ydb::RateLimiter::Resource& src, NKikimrKesus::TStre static void CopyProps(const NKikimrKesus::TStreamingQuoterResource& src, Ydb::RateLimiter::Resource& dst) { dst.set_resource_path(src.GetResourcePath()); - const auto& srcProps = src.GetHierarhicalDRRResourceConfig(); + const auto& srcProps = src.GetHierarchicalDRRResourceConfig(); auto& props = *dst.mutable_hierarchical_drr(); props.set_max_units_per_second(srcProps.GetMaxUnitsPerSecond()); props.set_max_burst_size_coefficient(srcProps.GetMaxBurstSizeCoefficient()); diff --git a/ydb/core/kesus/tablet/quoter_resource_tree.cpp b/ydb/core/kesus/tablet/quoter_resource_tree.cpp index 69a1f6c191..2881adfc70 100644 --- a/ydb/core/kesus/tablet/quoter_resource_tree.cpp +++ b/ydb/core/kesus/tablet/quoter_resource_tree.cpp @@ -145,16 +145,16 @@ public: }; // Resource in case of hierarchical DRR algorithm. -class THierarhicalDRRQuoterResourceTree : public TQuoterResourceTree, public THierarchicalDRRResourceConsumer { +class THierarchicalDRRQuoterResourceTree : public TQuoterResourceTree, public THierarchicalDRRResourceConsumer { public: using TQuoterResourceTree::TQuoterResourceTree; - THierarhicalDRRQuoterResourceTree* GetParent() { - return static_cast<THierarhicalDRRQuoterResourceTree*>(Parent); + THierarchicalDRRQuoterResourceTree* GetParent() { + return static_cast<THierarchicalDRRQuoterResourceTree*>(Parent); } - const THierarhicalDRRQuoterResourceTree* GetParent() const { - return static_cast<const THierarhicalDRRQuoterResourceTree*>(Parent); + const THierarchicalDRRQuoterResourceTree* GetParent() const { + return static_cast<const THierarchicalDRRQuoterResourceTree*>(Parent); } bool ValidateProps(const NKikimrKesus::TStreamingQuoterResource& props, TString& errorMessage) override; @@ -240,23 +240,23 @@ private: THolder<TQuoterResourceTree> CreateResource(ui64 resourceId, ui64 parentId, NActors::TActorId kesus, const IBillSink::TPtr& billSink, const NKikimrKesus::TStreamingQuoterResource& props) { Y_VERIFY(resourceId != parentId); - return MakeHolder<THierarhicalDRRQuoterResourceTree>(resourceId, parentId, kesus, billSink, props); + return MakeHolder<THierarchicalDRRQuoterResourceTree>(resourceId, parentId, kesus, billSink, props); } // Session in case of hierarchical DRR algorithm. -class THierarhicalDRRQuoterSession : public TQuoterSession, public THierarchicalDRRResourceConsumer { +class THierarchicalDRRQuoterSession : public TQuoterSession, public THierarchicalDRRResourceConsumer { public: - THierarhicalDRRQuoterSession(const NActors::TActorId& clientId, THierarhicalDRRQuoterResourceTree* resource) + THierarchicalDRRQuoterSession(const NActors::TActorId& clientId, THierarchicalDRRQuoterResourceTree* resource) : TQuoterSession(clientId, resource) { } - THierarhicalDRRQuoterResourceTree* GetResource() { - return static_cast<THierarhicalDRRQuoterResourceTree*>(Resource); + THierarchicalDRRQuoterResourceTree* GetResource() { + return static_cast<THierarchicalDRRQuoterResourceTree*>(Resource); } - const THierarhicalDRRQuoterResourceTree* GetResource() const { - return static_cast<const THierarhicalDRRQuoterResourceTree*>(Resource); + const THierarchicalDRRQuoterResourceTree* GetResource() const { + return static_cast<const THierarchicalDRRQuoterResourceTree*>(Resource); } void UpdateConsumptionState(bool consume, double amount, TTickProcessorQueue& queue, TInstant now) override; @@ -327,7 +327,7 @@ private: double FreeResource = 0.0; }; -double THierarhicalDRRQuoterSession::AccumulateResource(double amount, TInstant now) { +double THierarchicalDRRQuoterSession::AccumulateResource(double amount, TInstant now) { const double newFreeResource = Min(FreeResource + amount, AmountRequested + GetBurst()); double spent = newFreeResource - FreeResource; FreeResource = newFreeResource; @@ -350,14 +350,14 @@ double THierarhicalDRRQuoterSession::AccumulateResource(double amount, TInstant return spent; } -void THierarhicalDRRQuoterSession::CloseSession(Ydb::StatusIds::StatusCode status, const TString& reason) { +void THierarchicalDRRQuoterSession::CloseSession(Ydb::StatusIds::StatusCode status, const TString& reason) { TQuoterSession::CloseSession(status, reason); if (Active) { Deactivate(); } } -void THierarhicalDRRQuoterSession::UpdateConsumptionState(bool consume, double amount, TTickProcessorQueue& queue, TInstant now) { +void THierarchicalDRRQuoterSession::UpdateConsumptionState(bool consume, double amount, TTickProcessorQueue& queue, TInstant now) { LWPROBE(SessionUpdateConsumptionState, GetResource()->GetQuoterPath(), GetResource()->GetPath(), @@ -383,11 +383,11 @@ void THierarhicalDRRQuoterSession::UpdateConsumptionState(bool consume, double a } } -TInstant THierarhicalDRRQuoterSession::Account(TInstant start, TDuration interval, const double* values, size_t size, TTickProcessorQueue& queue, TInstant now) { +TInstant THierarchicalDRRQuoterSession::Account(TInstant start, TDuration interval, const double* values, size_t size, TTickProcessorQueue& queue, TInstant now) { return GetResource()->Report(ClientId, GetResource()->GetResourceId(), start, interval, values, size, queue, now); } -void THierarhicalDRRQuoterSession::SendAvailableResource() { +void THierarchicalDRRQuoterSession::SendAvailableResource() { if (FreeResource >= GetResource()->GetResourceFillingEpsilon()) { if (AmountRequested >= GetResource()->GetResourceFillingEpsilon()) { const double spent = Min(AmountRequested, FreeResource); @@ -405,7 +405,7 @@ void THierarhicalDRRQuoterSession::SendAvailableResource() { } } -void THierarhicalDRRQuoterSession::DoProcess(TTickProcessorQueue& queue, TInstant now) { +void THierarchicalDRRQuoterSession::DoProcess(TTickProcessorQueue& queue, TInstant now) { LWPROBE(SessionProcess, GetResource()->GetQuoterPath(), GetResource()->GetPath(), @@ -420,11 +420,11 @@ void THierarhicalDRRQuoterSession::DoProcess(TTickProcessorQueue& queue, TInstan } } -void THierarhicalDRRQuoterSession::ScheduleNextTick(TTickProcessorQueue& queue, TInstant now) { +void THierarchicalDRRQuoterSession::ScheduleNextTick(TTickProcessorQueue& queue, TInstant now) { Schedule(queue, NextTick(now, GetResource()->GetTickSize())); } -void THierarhicalDRRQuoterSession::OnPropsChanged() { +void THierarchicalDRRQuoterSession::OnPropsChanged() { FreeResource = Min(FreeResource, AmountRequested + GetBurst()); TQuoterSession::OnPropsChanged(); } @@ -571,12 +571,12 @@ void TQuoterResourceTree::TCounters::SetLimit(TMaybe<double> limit) { } } -bool THierarhicalDRRQuoterResourceTree::ValidateProps(const NKikimrKesus::TStreamingQuoterResource& props, TString& errorMessage) { - if (!props.HasHierarhicalDRRResourceConfig()) { - errorMessage = "No HierarhicalDRRResourceConfig specified."; +bool THierarchicalDRRQuoterResourceTree::ValidateProps(const NKikimrKesus::TStreamingQuoterResource& props, TString& errorMessage) { + if (!props.HasHierarchicalDRRResourceConfig()) { + errorMessage = "No HierarchicalDRRResourceConfig specified."; return false; } - const auto& hdrrConfig = props.GetHierarhicalDRRResourceConfig(); + const auto& hdrrConfig = props.GetHierarchicalDRRResourceConfig(); const double maxUnitsPerSecond = hdrrConfig.GetMaxUnitsPerSecond() ? hdrrConfig.GetMaxUnitsPerSecond() : hdrrConfig.GetSpeedSettings().GetMaxUnitsPerSecond(); if (!std::isfinite(maxUnitsPerSecond)) { @@ -620,15 +620,15 @@ bool THierarhicalDRRQuoterResourceTree::ValidateProps(const NKikimrKesus::TStrea return TQuoterResourceTree::ValidateProps(props, errorMessage); } -void THierarhicalDRRQuoterResourceTree::CalcParameters() { +void THierarchicalDRRQuoterResourceTree::CalcParameters() { // compatibility - if (!Props.GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond() && Props.GetHierarhicalDRRResourceConfig().GetSpeedSettings().GetMaxUnitsPerSecond()) { - Props.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(Props.GetHierarhicalDRRResourceConfig().GetSpeedSettings().GetMaxUnitsPerSecond()); + if (!Props.GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond() && Props.GetHierarchicalDRRResourceConfig().GetSpeedSettings().GetMaxUnitsPerSecond()) { + Props.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(Props.GetHierarchicalDRRResourceConfig().GetSpeedSettings().GetMaxUnitsPerSecond()); } // speed settings - THierarhicalDRRQuoterResourceTree* const parent = GetParent(); - const auto& config = GetProps().GetHierarhicalDRRResourceConfig(); + THierarchicalDRRQuoterResourceTree* const parent = GetParent(); + const auto& config = GetProps().GetHierarchicalDRRResourceConfig(); if (config.GetMaxUnitsPerSecond()) { MaxUnitsPerSecond = config.GetMaxUnitsPerSecond(); } else if (parent) { @@ -667,7 +667,7 @@ void THierarhicalDRRQuoterResourceTree::CalcParameters() { FreeResource = Min(FreeResource, HasActiveChildren() ? ResourceTickQuantum : GetBurst()); // Update in props - auto* effectiveConfig = EffectiveProps.MutableHierarhicalDRRResourceConfig(); + auto* effectiveConfig = EffectiveProps.MutableHierarchicalDRRResourceConfig(); effectiveConfig->SetMaxUnitsPerSecond(MaxUnitsPerSecond); effectiveConfig->SetWeight(Weight); effectiveConfig->SetMaxBurstSizeCoefficient(1); @@ -681,7 +681,7 @@ void THierarhicalDRRQuoterResourceTree::CalcParameters() { TQuoterResourceTree::CalcParameters(); // recalc for children } -void THierarhicalDRRQuoterResourceTree::CalcParametersForAccounting() { +void THierarchicalDRRQuoterResourceTree::CalcParametersForAccounting() { const auto* accCfgParent = Parent ? &Parent->GetEffectiveProps().GetAccountingConfig() : nullptr; auto* accCfg = EffectiveProps.MutableAccountingConfig(); @@ -737,8 +737,8 @@ void THierarhicalDRRQuoterResourceTree::CalcParametersForAccounting() { } } -void THierarhicalDRRQuoterResourceTree::RemoveChild(TQuoterResourceTree* childBase) { - THierarhicalDRRQuoterResourceTree* child = static_cast<THierarhicalDRRQuoterResourceTree*>(childBase); +void THierarchicalDRRQuoterResourceTree::RemoveChild(TQuoterResourceTree* childBase) { + THierarchicalDRRQuoterResourceTree* child = static_cast<THierarchicalDRRQuoterResourceTree*>(childBase); if (child->Active) { child->Active = false; RemoveActiveChild(child); @@ -746,7 +746,7 @@ void THierarhicalDRRQuoterResourceTree::RemoveChild(TQuoterResourceTree* childBa TQuoterResourceTree::RemoveChild(childBase); } -void THierarhicalDRRQuoterResourceTree::DeactivateIfFull(TInstant now) { +void THierarchicalDRRQuoterResourceTree::DeactivateIfFull(TInstant now) { if (!HasActiveChildren() && IsFull()) { Active = false; LWPROBE(ResourceDeactivate, @@ -759,7 +759,7 @@ void THierarhicalDRRQuoterResourceTree::DeactivateIfFull(TInstant now) { } } -double THierarhicalDRRQuoterResourceTree::AccumulateResource(double amount, TInstant now) { +double THierarchicalDRRQuoterResourceTree::AccumulateResource(double amount, TInstant now) { amount = Min(amount, ResourceTickQuantum); const double newFreeResource = Min(FreeResource + amount, HasActiveChildren() ? ResourceTickQuantum : GetBurst()); double spent = newFreeResource - FreeResource; @@ -779,7 +779,7 @@ double THierarhicalDRRQuoterResourceTree::AccumulateResource(double amount, TIns return spent; } -void THierarhicalDRRQuoterResourceTree::DoProcess(TTickProcessorQueue& queue, TInstant now) { +void THierarchicalDRRQuoterResourceTree::DoProcess(TTickProcessorQueue& queue, TInstant now) { LWPROBE(ResourceProcess, QuoterPath, GetPath(), @@ -840,7 +840,7 @@ void THierarhicalDRRQuoterResourceTree::DoProcess(TTickProcessorQueue& queue, TI } } -TInstant THierarhicalDRRQuoterResourceTree::Report( +TInstant THierarchicalDRRQuoterResourceTree::Report( const NActors::TActorId& clientId, ui64 resourceId, TInstant start, @@ -863,7 +863,7 @@ TInstant THierarhicalDRRQuoterResourceTree::Report( } } -void THierarhicalDRRQuoterResourceTree::RunAccounting() { +void THierarchicalDRRQuoterResourceTree::RunAccounting() { if (RateAccounting) { ActiveAccounting = RateAccounting->RunAccounting(); } else { @@ -871,7 +871,7 @@ void THierarhicalDRRQuoterResourceTree::RunAccounting() { } } -void THierarhicalDRRQuoterResourceTree::AddActiveChild(THierarchicalDRRResourceConsumer* child, TTickProcessorQueue& queue, TInstant now) { +void THierarchicalDRRQuoterResourceTree::AddActiveChild(THierarchicalDRRResourceConsumer* child, TTickProcessorQueue& queue, TInstant now) { UpdateActiveTime(now); if (!HasActiveChildren()) { CurrentActiveChild = child; @@ -902,7 +902,7 @@ void THierarhicalDRRQuoterResourceTree::AddActiveChild(THierarchicalDRRResourceC } } -void THierarhicalDRRQuoterResourceTree::RemoveActiveChild(THierarchicalDRRResourceConsumer* child) { +void THierarchicalDRRQuoterResourceTree::RemoveActiveChild(THierarchicalDRRResourceConsumer* child) { if (HasActiveChildren()) { if (child == CurrentActiveChild) { CurrentActiveChild = CurrentActiveChild->GetNext<THierarchicalDRRResourceConsumer>(); @@ -921,15 +921,15 @@ void THierarhicalDRRQuoterResourceTree::RemoveActiveChild(THierarchicalDRRResour } } -void THierarhicalDRRQuoterResourceTree::ScheduleNextTick(TTickProcessorQueue& queue, TInstant now) { +void THierarchicalDRRQuoterResourceTree::ScheduleNextTick(TTickProcessorQueue& queue, TInstant now) { Schedule(queue, NextTick(now, TickSize)); } -THolder<TQuoterSession> THierarhicalDRRQuoterResourceTree::DoCreateSession(const NActors::TActorId& clientId) { - return MakeHolder<THierarhicalDRRQuoterSession>(clientId, this); +THolder<TQuoterSession> THierarchicalDRRQuoterResourceTree::DoCreateSession(const NActors::TActorId& clientId) { + return MakeHolder<THierarchicalDRRQuoterSession>(clientId, this); } -void THierarhicalDRRQuoterResourceTree::SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters) { +void THierarchicalDRRQuoterResourceTree::SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters) { TQuoterResourceTree::SetResourceCounters(std::move(resourceCounters)); if (RateAccounting) { RateAccounting->SetResourceCounters(Counters.ResourceCounters); @@ -937,8 +937,8 @@ void THierarhicalDRRQuoterResourceTree::SetResourceCounters(TIntrusivePtr<::NMon SetLimitCounter(); } -void THierarhicalDRRQuoterResourceTree::SetLimitCounter() { - const double speedLimit = GetProps().GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(); +void THierarchicalDRRQuoterResourceTree::SetLimitCounter() { + const double speedLimit = GetProps().GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(); if (speedLimit) { Counters.SetLimit(speedLimit); } else { diff --git a/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp b/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp index b280b4b29b..5ed631fe9c 100644 --- a/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp +++ b/ydb/core/kesus/tablet/quoter_resource_tree_ut.cpp @@ -158,7 +158,7 @@ public: TQuoterResourceTree* AddResource(const TString& path, const NKikimrKesus::THierarchicalDRRResourceConfig& config = {}) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath(path); - *cfg.MutableHierarhicalDRRResourceConfig() = config; + *cfg.MutableHierarchicalDRRResourceConfig() = config; TString errorMessage; TQuoterResourceTree* res = Resources->AddResource(NextResourceId++, cfg, errorMessage); UNIT_ASSERT_C(res, "Failed to add resource [" << path << "]: " << errorMessage); @@ -254,14 +254,14 @@ public: .After(oldSettingsAllocation) .WillOnce(Invoke([](ui64, double, const NKikimrKesus::TStreamingQuoterResource* props) { UNIT_ASSERT(props != nullptr); - UNIT_ASSERT_DOUBLES_EQUAL(props->GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), 400, 0.001); + UNIT_ASSERT_DOUBLES_EQUAL(props->GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 400, 0.001); })); EXPECT_CALL(*session.Sink, OnSend(_, DoubleNear(40, 0.01), nullptr)) .After(updateSend); ProcessTicks(2); NKikimrKesus::TStreamingQuoterResource newProps; - newProps.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(400); + newProps.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(400); TString msg; UNIT_ASSERT(root->Update(newProps, msg)); Resources->OnUpdateResourceProps(root); @@ -429,10 +429,10 @@ public: cfg.SetMaxUnitsPerSecond(200); auto* res = AddResource("/Root/Res", cfg); - UNIT_ASSERT_DOUBLES_EQUAL(res->GetEffectiveProps().GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100, 0.001); // min + UNIT_ASSERT_DOUBLES_EQUAL(res->GetEffectiveProps().GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100, 0.001); // min auto* res2 = AddResource("/Root/Res2"); - UNIT_ASSERT_DOUBLES_EQUAL(res2->GetEffectiveProps().GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100, 0.001); // inherits + UNIT_ASSERT_DOUBLES_EQUAL(res2->GetEffectiveProps().GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100, 0.001); // inherits } void TestWeights() { @@ -491,7 +491,7 @@ public: // It is expected that a new weight will be applied in the next tick. TString msg; NKikimrKesus::TStreamingQuoterResource newPropsWithoutWeight; - newPropsWithoutWeight.MutableHierarhicalDRRResourceConfig(); + newPropsWithoutWeight.MutableHierarchicalDRRResourceConfig(); UNIT_ASSERT_C(heavyRes->Update(newPropsWithoutWeight, msg), msg); Resources->OnUpdateResourceProps(heavyRes); diff --git a/ydb/core/kesus/tablet/rate_accounting.cpp b/ydb/core/kesus/tablet/rate_accounting.cpp index cd7123ab27..0d2c80a8ad 100644 --- a/ydb/core/kesus/tablet/rate_accounting.cpp +++ b/ydb/core/kesus/tablet/rate_accounting.cpp @@ -262,7 +262,7 @@ private: void Configure(const NKikimrKesus::TStreamingQuoterResource& props) { const auto& accCfg = props.GetAccountingConfig(); - const auto& resCfg = props.GetHierarhicalDRRResourceConfig(); + const auto& resCfg = props.GetHierarchicalDRRResourceConfig(); ProvisionedBucket.SetRate(accCfg.GetProvisionedUnitsPerSecond()); ProvisionedBucket.SetCapacity(accCfg.GetProvisionedUnitsPerSecond() * accCfg.GetProvisionedCoefficient()); OnDemandBucket.SetRate(resCfg.GetMaxUnitsPerSecond()); diff --git a/ydb/core/kesus/tablet/tablet_ut.cpp b/ydb/core/kesus/tablet/tablet_ut.cpp index d73b3c3805..eb28909b36 100644 --- a/ydb/core/kesus/tablet/tablet_ut.cpp +++ b/ydb/core/kesus/tablet/tablet_ut.cpp @@ -1397,13 +1397,13 @@ Y_UNIT_TEST_SUITE(TKesusTest) { UNIT_ASSERT_VALUES_EQUAL(resources.GetResources(7).GetResourceId(), 8); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(1).GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), + resources.GetResources(1).GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100500, 0.001); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(6).GetHierarhicalDRRResourceConfig().GetMaxBurstSizeCoefficient(), + resources.GetResources(6).GetHierarchicalDRRResourceConfig().GetMaxBurstSizeCoefficient(), 1.5, 0.001); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(7).GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), + resources.GetResources(7).GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 10, 0.001); } { @@ -1452,7 +1452,7 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource res; res.SetResourceId(42); res.SetResourcePath("/CorrentPath"); - res.MutableHierarhicalDRRResourceConfig(); + res.MutableHierarchicalDRRResourceConfig(); ctx.AddQuoterResource(res, Ydb::StatusIds::BAD_REQUEST); // resource id specified } { @@ -1483,7 +1483,7 @@ Y_UNIT_TEST_SUITE(TKesusTest) { UNIT_ASSERT_VALUES_EQUAL(resources.GetResources(2).GetResourceId(), 2); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(1).GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), + resources.GetResources(1).GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100500, 0.001); }; checkResources(); @@ -1545,10 +1545,10 @@ Y_UNIT_TEST_SUITE(TKesusTest) { UNIT_ASSERT_STRINGS_EQUAL(resources.GetResources(1).GetResourcePath(), "Root/Q"); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(0).GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), + resources.GetResources(0).GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100, 0.001); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(1).GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), + resources.GetResources(1).GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 100, 0.001); }; testBeforeModification(); @@ -1562,10 +1562,10 @@ Y_UNIT_TEST_SUITE(TKesusTest) { UNIT_ASSERT_STRINGS_EQUAL(resources.GetResources(1).GetResourcePath(), "Root/Q"); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(0).GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), + resources.GetResources(0).GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 5, 0.001); UNIT_ASSERT_DOUBLES_EQUAL( - resources.GetResources(1).GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), + resources.GetResources(1).GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 5, 0.001); }; @@ -1578,7 +1578,7 @@ Y_UNIT_TEST_SUITE(TKesusTest) { // test validation { NKikimrKesus::TStreamingQuoterResource req; - *req.MutableHierarhicalDRRResourceConfig() = cfg3; + *req.MutableHierarchicalDRRResourceConfig() = cfg3; ctx.UpdateQuoterResource(req, Ydb::StatusIds::BAD_REQUEST); // no resource path and id testAfterModification(); @@ -1599,7 +1599,7 @@ Y_UNIT_TEST_SUITE(TKesusTest) { testAfterModification(); req.SetResourcePath("/Root/P"); - *req.MutableHierarhicalDRRResourceConfig() = cfg3; + *req.MutableHierarchicalDRRResourceConfig() = cfg3; ctx.UpdateQuoterResource(req, Ydb::StatusIds::NOT_FOUND); // no such resource testAfterModification(); ctx.RebootTablet(); @@ -1724,8 +1724,8 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath("/Root"); - cfg.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(100.0); - cfg.MutableHierarhicalDRRResourceConfig()->SetPrefetchCoefficient(300.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(100.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetPrefetchCoefficient(300.0); cfg.MutableAccountingConfig()->SetEnabled(true); cfg.MutableAccountingConfig()->SetReportPeriodMs(1000); cfg.MutableAccountingConfig()->SetAccountPeriodMs(1000); @@ -1777,8 +1777,8 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath("/Root"); - cfg.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); - cfg.MutableHierarhicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); cfg.MutableAccountingConfig()->SetEnabled(true); cfg.MutableAccountingConfig()->SetReportPeriodMs(1000); cfg.MutableAccountingConfig()->SetAccountPeriodMs(1000); @@ -1830,8 +1830,8 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath("/Root"); - cfg.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); - cfg.MutableHierarhicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); cfg.MutableAccountingConfig()->SetEnabled(true); cfg.MutableAccountingConfig()->SetReportPeriodMs(1000); cfg.MutableAccountingConfig()->SetAccountPeriodMs(1000); @@ -1887,8 +1887,8 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath("/Root"); - cfg.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); - cfg.MutableHierarhicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); cfg.MutableAccountingConfig()->SetEnabled(true); cfg.MutableAccountingConfig()->SetReportPeriodMs(1000); cfg.MutableAccountingConfig()->SetAccountPeriodMs(1000); @@ -1948,8 +1948,8 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath("/Root"); - cfg.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); - cfg.MutableHierarhicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); cfg.MutableAccountingConfig()->SetEnabled(true); cfg.MutableAccountingConfig()->SetReportPeriodMs(1000); cfg.MutableAccountingConfig()->SetAccountPeriodMs(1000); @@ -2012,8 +2012,8 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath("/Root"); - cfg.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); - cfg.MutableHierarhicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); cfg.MutableAccountingConfig()->SetEnabled(true); cfg.MutableAccountingConfig()->SetReportPeriodMs(1000); cfg.MutableAccountingConfig()->SetAccountPeriodMs(1000); @@ -2071,8 +2071,8 @@ Y_UNIT_TEST_SUITE(TKesusTest) { NKikimrKesus::TStreamingQuoterResource cfg; cfg.SetResourcePath("/Root"); - cfg.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); - cfg.MutableHierarhicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(300.0); + cfg.MutableHierarchicalDRRResourceConfig()->SetPrefetchCoefficient(1.0); cfg.MutableAccountingConfig()->SetEnabled(true); cfg.MutableAccountingConfig()->SetReportPeriodMs(1000); cfg.MutableAccountingConfig()->SetAccountPeriodMs(1000); @@ -2143,7 +2143,7 @@ Y_UNIT_TEST_SUITE(TKesusTest) { UNIT_ASSERT_VALUES_EQUAL(result->Record.ResourcesInfoSize(), 1); const auto& info = result->Record.GetResourcesInfo(0); UNIT_ASSERT_VALUES_EQUAL(info.GetStateNotification().GetStatus(), Ydb::StatusIds::SUCCESS); - UNIT_ASSERT_DOUBLES_EQUAL(info.GetEffectiveProps().GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond(), 150.0, 0.001); + UNIT_ASSERT_DOUBLES_EQUAL(info.GetEffectiveProps().GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond(), 150.0, 0.001); } Y_UNIT_TEST(TestGetQuoterResourceCounters) { diff --git a/ydb/core/kesus/tablet/tx_quoter_resource_add.cpp b/ydb/core/kesus/tablet/tx_quoter_resource_add.cpp index fa5755eb6e..aabaf7f00b 100644 --- a/ydb/core/kesus/tablet/tx_quoter_resource_add.cpp +++ b/ydb/core/kesus/tablet/tx_quoter_resource_add.cpp @@ -33,11 +33,11 @@ struct TKesusTablet::TTxQuoterResourceAdd : public TTxBase { LOG_DEBUG_S(ctx, NKikimrServices::KESUS_TABLET, "[" << Self->TabletID() << "] TTxQuoterResourceAdd::Execute (sender=" << Sender << ", cookie=" << Cookie << ", path=\"" << Record.GetResource().GetResourcePath() - << "\", config=" << Record.GetResource().GetHierarhicalDRRResourceConfig() << ")"); + << "\", config=" << Record.GetResource().GetHierarchicalDRRResourceConfig() << ")"); const auto& resourceDesc = Record.GetResource(); if (const TQuoterResourceTree* resource = Self->QuoterResources.FindPath(resourceDesc.GetResourcePath())) { - if (NProtoBuf::IsEqual(resource->GetProps().GetHierarhicalDRRResourceConfig(), resourceDesc.GetHierarhicalDRRResourceConfig())) { + if (NProtoBuf::IsEqual(resource->GetProps().GetHierarchicalDRRResourceConfig(), resourceDesc.GetHierarchicalDRRResourceConfig())) { THolder<TEvKesus::TEvAddQuoterResourceResult> reply = MakeHolder<TEvKesus::TEvAddQuoterResourceResult>( Ydb::StatusIds::ALREADY_EXISTS, @@ -103,7 +103,7 @@ void TKesusTablet::Handle(TEvKesus::TEvAddQuoterResource::TPtr& ev) { return; } - if (!resourceDesc.HasHierarhicalDRRResourceConfig()) { + if (!resourceDesc.HasHierarchicalDRRResourceConfig()) { Send(ev->Sender, new TEvKesus::TEvAddQuoterResourceResult( Ydb::StatusIds::BAD_REQUEST, diff --git a/ydb/core/kesus/tablet/tx_quoter_resource_update.cpp b/ydb/core/kesus/tablet/tx_quoter_resource_update.cpp index 7189612061..771121fe32 100644 --- a/ydb/core/kesus/tablet/tx_quoter_resource_update.cpp +++ b/ydb/core/kesus/tablet/tx_quoter_resource_update.cpp @@ -31,7 +31,7 @@ struct TKesusTablet::TTxQuoterResourceUpdate : public TTxBase { LOG_DEBUG_S(ctx, NKikimrServices::KESUS_TABLET, "[" << Self->TabletID() << "] TTxQuoterResourceUpdate::Execute (sender=" << Sender << ", cookie=" << Cookie << ", id=" << Record.GetResource().GetResourceId() << ", path=\"" << Record.GetResource().GetResourcePath() - << "\", config=" << Record.GetResource().GetHierarhicalDRRResourceConfig() << ")"); + << "\", config=" << Record.GetResource().GetHierarchicalDRRResourceConfig() << ")"); const auto& resourceDesc = Record.GetResource(); TQuoterResourceTree* resource = resourceDesc.GetResourceId() ? @@ -102,7 +102,7 @@ void TKesusTablet::Handle(TEvKesus::TEvUpdateQuoterResource::TPtr& ev) { return; } - if (!resourceDesc.HasHierarhicalDRRResourceConfig()) { + if (!resourceDesc.HasHierarchicalDRRResourceConfig()) { Send(ev->Sender, new TEvKesus::TEvUpdateQuoterResourceResult( Ydb::StatusIds::BAD_REQUEST, diff --git a/ydb/core/kesus/tablet/ut_helpers.cpp b/ydb/core/kesus/tablet/ut_helpers.cpp index 595c77b5be..4abd284256 100644 --- a/ydb/core/kesus/tablet/ut_helpers.cpp +++ b/ydb/core/kesus/tablet/ut_helpers.cpp @@ -732,7 +732,7 @@ ui64 TTestContext::AddQuoterResource(const NKikimrKesus::TStreamingQuoterResourc ui64 TTestContext::AddQuoterResource(const TString& resourcePath, const NKikimrKesus::THierarchicalDRRResourceConfig& config, Ydb::StatusIds::StatusCode status) { NKikimrKesus::TStreamingQuoterResource resource; resource.SetResourcePath(resourcePath); - *resource.MutableHierarhicalDRRResourceConfig() = config; + *resource.MutableHierarchicalDRRResourceConfig() = config; return AddQuoterResource(resource, status); } @@ -752,14 +752,14 @@ void TTestContext::UpdateQuoterResource(const NKikimrKesus::TStreamingQuoterReso void TTestContext::UpdateQuoterResource(const TString& resourcePath, const NKikimrKesus::THierarchicalDRRResourceConfig& config, Ydb::StatusIds::StatusCode status) { NKikimrKesus::TStreamingQuoterResource resource; resource.SetResourcePath(resourcePath); - *resource.MutableHierarhicalDRRResourceConfig() = config; + *resource.MutableHierarchicalDRRResourceConfig() = config; UpdateQuoterResource(resource, status); } void TTestContext::UpdateQuoterResource(ui64 resourceId, const NKikimrKesus::THierarchicalDRRResourceConfig& config, Ydb::StatusIds::StatusCode status) { NKikimrKesus::TStreamingQuoterResource resource; resource.SetResourceId(resourceId); - *resource.MutableHierarhicalDRRResourceConfig() = config; + *resource.MutableHierarchicalDRRResourceConfig() = config; UpdateQuoterResource(resource, status); } diff --git a/ydb/core/protos/kesus.proto b/ydb/core/protos/kesus.proto index 7c03a3ccd9..e3ffdfa954 100644 --- a/ydb/core/protos/kesus.proto +++ b/ydb/core/protos/kesus.proto @@ -361,8 +361,8 @@ message TStreamingQuoterResource { string ResourcePath = 2; oneof AlgorithmSpecificConfig { - // For Hierarhical DRR algorithm. - THierarchicalDRRResourceConfig HierarhicalDRRResourceConfig = 3; + // For Hierarchical DRR algorithm. + THierarchicalDRRResourceConfig HierarchicalDRRResourceConfig = 3; } TAccountingConfig AccountingConfig = 4; } diff --git a/ydb/core/quoter/kesus_quoter_proxy.cpp b/ydb/core/quoter/kesus_quoter_proxy.cpp index edf33160b3..02de6c96a6 100644 --- a/ydb/core/quoter/kesus_quoter_proxy.cpp +++ b/ydb/core/quoter/kesus_quoter_proxy.cpp @@ -163,7 +163,7 @@ class TKesusQuoterProxy : public TActorBootstrapped<TKesusQuoterProxy> { void SetProps(const NKikimrKesus::TStreamingQuoterResource& props) { Props = props; - const auto& cfg = Props.GetHierarhicalDRRResourceConfig(); + const auto& cfg = Props.GetHierarchicalDRRResourceConfig(); const double speed = cfg.GetMaxUnitsPerSecond(); const double prefetch = cfg.GetPrefetchCoefficient() ? cfg.GetPrefetchCoefficient() : PREFETCH_COEFFICIENT_DEFAULT; const double watermark = std::clamp(cfg.GetPrefetchWatermark() ? cfg.GetPrefetchWatermark() : PREFETCH_WATERMARK_DEFAULT, 0.0, 1.0); @@ -982,7 +982,7 @@ TKesusResourceAllocationStatistics::TKesusResourceAllocationStatistics(size_t wi void TKesusResourceAllocationStatistics::SetProps(const NKikimrKesus::TStreamingQuoterResource& props) { DefaultAllocationDelta = TDuration::MilliSeconds(100); - DefaultAllocationAmount = props.GetHierarhicalDRRResourceConfig().GetMaxUnitsPerSecond() / 10; + DefaultAllocationAmount = props.GetHierarchicalDRRResourceConfig().GetMaxUnitsPerSecond() / 10; } void TKesusResourceAllocationStatistics::OnConnected() { diff --git a/ydb/core/quoter/kesus_quoter_ut.cpp b/ydb/core/quoter/kesus_quoter_ut.cpp index 430db7db48..1e2e20846f 100644 --- a/ydb/core/quoter/kesus_quoter_ut.cpp +++ b/ydb/core/quoter/kesus_quoter_ut.cpp @@ -207,7 +207,7 @@ Y_UNIT_TEST_SUITE(QuoterWithKesusTest) { Y_UNIT_TEST_SUITE(KesusProxyTest) { void FillProps(NKikimrKesus::TStreamingQuoterResource* props, ui64 resId = 42, double speed = 100.0) { props->SetResourceId(resId); - auto* cfg = props->MutableHierarhicalDRRResourceConfig(); + auto* cfg = props->MutableHierarchicalDRRResourceConfig(); cfg->SetMaxUnitsPerSecond(speed); } @@ -616,7 +616,7 @@ Y_UNIT_TEST_SUITE(KesusResourceAllocationStatisticsTest) { Y_UNIT_TEST(ReturnsDefaultValues) { TKesusResourceAllocationStatistics stat; NKikimrKesus::TStreamingQuoterResource props; - props.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(42); + props.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(42); stat.SetProps(props); CheckParams(stat, TDuration::MilliSeconds(100), 4.2); diff --git a/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp b/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp index 4b301ea3ed..9f15d06d72 100644 --- a/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp +++ b/ydb/core/quoter/quoter_service_bandwidth_test/server.cpp @@ -111,7 +111,7 @@ void TTestServer::CreateKesusResource(ui64 kesusTabletId, const TString& resourc TAutoPtr<NKesus::TEvKesus::TEvAddQuoterResource> request(new NKesus::TEvKesus::TEvAddQuoterResource()); request->Record.MutableResource()->SetResourcePath(resourcePath); - auto* hdrrConfig = request->Record.MutableResource()->MutableHierarhicalDRRResourceConfig(); // Create HDRR config + auto* hdrrConfig = request->Record.MutableResource()->MutableHierarchicalDRRResourceConfig(); // Create HDRR config if (maxUnitsPerSecond) { hdrrConfig->SetMaxUnitsPerSecond(*maxUnitsPerSecond); } diff --git a/ydb/core/quoter/quoter_service_ut.cpp b/ydb/core/quoter/quoter_service_ut.cpp index 88c74ca3fb..46772dedd6 100644 --- a/ydb/core/quoter/quoter_service_ut.cpp +++ b/ydb/core/quoter/quoter_service_ut.cpp @@ -147,7 +147,7 @@ Y_UNIT_TEST_SUITE(TQuoterServiceTest) { // request TAutoPtr<NKesus::TEvKesus::TEvAddQuoterResource> request(new NKesus::TEvKesus::TEvAddQuoterResource()); request->Record.MutableResource()->SetResourcePath("/Res"); - request->Record.MutableResource()->MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(rate); + request->Record.MutableResource()->MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(rate); // Get tablet id TAutoPtr<NMsgBusProxy::TBusResponse> resp = client.Ls(TStringBuilder() << Tests::TestDomainName << "/KesusQuoter"); diff --git a/ydb/core/quoter/ut_helpers.cpp b/ydb/core/quoter/ut_helpers.cpp index 82de76413f..ca36d439c9 100644 --- a/ydb/core/quoter/ut_helpers.cpp +++ b/ydb/core/quoter/ut_helpers.cpp @@ -75,7 +75,7 @@ void TKesusQuoterTestSetup::CreateKesusResource(const TString& kesusPath, const TAutoPtr<NKesus::TEvKesus::TEvAddQuoterResource> request(new NKesus::TEvKesus::TEvAddQuoterResource()); request->Record.MutableResource()->SetResourcePath(resourcePath); - *request->Record.MutableResource()->MutableHierarhicalDRRResourceConfig() = cfg; + *request->Record.MutableResource()->MutableHierarchicalDRRResourceConfig() = cfg; TActorId sender = GetEdgeActor(); Cerr << "AddQuoterResource: " << request->Record << Endl; diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp index e15d4865f0..d250e8277e 100644 --- a/ydb/core/testlib/test_client.cpp +++ b/ydb/core/testlib/test_client.cpp @@ -2508,7 +2508,7 @@ namespace Tests { Ydb::StatusIds::StatusCode TClient::AddQuoterResource(TTestActorRuntime* runtime, const TString& kesusPath, const TString& resourcePath, const NKikimrKesus::THierarchicalDRRResourceConfig& props) { THolder<NKesus::TEvKesus::TEvAddQuoterResource> request = MakeHolder<NKesus::TEvKesus::TEvAddQuoterResource>(); request->Record.MutableResource()->SetResourcePath(resourcePath); - *request->Record.MutableResource()->MutableHierarhicalDRRResourceConfig() = props; + *request->Record.MutableResource()->MutableHierarchicalDRRResourceConfig() = props; TActorId sender = runtime->AllocateEdgeActor(0); ForwardToTablet(*runtime, GetKesusTabletId(kesusPath), sender, request.Release(), 0); diff --git a/ydb/core/ymq/actor/queue_schema.cpp b/ydb/core/ymq/actor/queue_schema.cpp index b7b81610ae..401eb215d0 100644 --- a/ydb/core/ymq/actor/queue_schema.cpp +++ b/ydb/core/ymq/actor/queue_schema.cpp @@ -681,7 +681,7 @@ void TCreateQueueSchemaActorV2::AddRPSQuota() { NKikimrKesus::TEvAddQuoterResource cmd; auto& res = *cmd.MutableResource(); res.SetResourcePath(TStringBuilder() << RPS_QUOTA_NAME << "/" << QueuePath_.QueueName); - res.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(Cfg().GetQuotingConfig().GetKesusQuoterConfig().GetDefaultLimits().GetStdSendMessageRate()); + res.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(Cfg().GetQuotingConfig().GetKesusQuoterConfig().GetDefaultLimits().GetStdSendMessageRate()); AddQuoterResourceActor_ = RunAddQuoterResource(TStringBuilder() << QueuePath_.GetUserPath() << "/" << QUOTER_KESUS_NAME, cmd, RequestId_); } diff --git a/ydb/core/ymq/actor/schema.cpp b/ydb/core/ymq/actor/schema.cpp index 20e84581fe..82dcf469f7 100644 --- a/ydb/core/ymq/actor/schema.cpp +++ b/ydb/core/ymq/actor/schema.cpp @@ -375,7 +375,7 @@ void TCreateUserSchemaActor::AddRPSQuota() { NKikimrKesus::TEvAddQuoterResource cmd; auto& res = *cmd.MutableResource(); res.SetResourcePath(RPS_QUOTA_NAME); - res.MutableHierarhicalDRRResourceConfig()->SetMaxUnitsPerSecond(1000); + res.MutableHierarchicalDRRResourceConfig()->SetMaxUnitsPerSecond(1000); AddQuoterResourceActor_ = RunAddQuoterResource(KesusPathId_.first, KesusPathId_.second, cmd, RequestId_); } |