Skip to content

Commit 234ec92

Browse files
swalrus1swalrus1
authored
Merge 8cdcdf8 into 4b5d232 
2 parents 4b5d232 + 8cdcdf8 commit 234ec92

File tree

29 files changed

+205
-161
lines changed

29 files changed

+205
-161
lines changed

‎ydb/core/kqp/ut/olap/blobs_sharing_ut.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
9393
, Controller(NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>()) {
9494
Controller->SetCompactionControl(NYDBTest::EOptimizerCompactionWeightControl::Disable);
9595
Controller->SetExpectedShardsCount(ShardsCount);
96-
Controller->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1));
97-
Controller->SetReadTimeoutClean(TDuration::Seconds(1));
96+
Controller->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1));
97+
Controller->SetOverrideReadTimeoutClean(TDuration::Seconds(1));
9898

9999
Tests::NCommon::TLoggerInit(Kikimr).SetComponents({ NKikimrServices::TX_COLUMNSHARD }, "CS").Initialize();
100100

@@ -111,7 +111,7 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
111111
}
112112

113113
void WaitNormalization() {
114-
Controller->SetReadTimeoutClean(TDuration::Seconds(1));
114+
Controller->SetOverrideReadTimeoutClean(TDuration::Seconds(1));
115115
Controller->SetCompactionControl(NYDBTest::EOptimizerCompactionWeightControl::Force);
116116
const auto start = TInstant::Now();
117117
while (!Controller->IsTrivialLinks() && TInstant::Now() - start < TDuration::Seconds(30)) {
@@ -120,11 +120,11 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
120120
}
121121
AFL_VERIFY(Controller->IsTrivialLinks());
122122
Controller->CheckInvariants();
123-
Controller->SetReadTimeoutClean(TDuration::Minutes(5));
123+
Controller->SetOverrideReadTimeoutClean(TDuration::Minutes(5));
124124
}
125125

126126
void Execute(const ui64 destinationIdx, const std::vector<ui64>& sourceIdxs, const bool move, const NOlap::TSnapshot& snapshot, const std::set<ui64>& pathIdxs) {
127-
Controller->SetReadTimeoutClean(TDuration::Seconds(1));
127+
Controller->SetOverrideReadTimeoutClean(TDuration::Seconds(1));
128128
AFL_VERIFY(destinationIdx < ShardIds.size());
129129
const ui64 destination = ShardIds[destinationIdx];
130130
std::vector<ui64> sources;
@@ -192,7 +192,7 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
192192
CSTransferStatus->Reset();
193193
AFL_VERIFY(!Controller->IsTrivialLinks());
194194
Controller->CheckInvariants();
195-
Controller->SetReadTimeoutClean(TDuration::Minutes(5));
195+
Controller->SetOverrideReadTimeoutClean(TDuration::Minutes(5));
196196
}
197197
};
198198
Y_UNIT_TEST(BlobsSharingSplit1_1) {
@@ -318,8 +318,8 @@ Y_UNIT_TEST_SUITE(KqpOlapBlobsSharing) {
318318

319319
void Execute() {
320320
auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>();
321-
csController->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1));
322-
csController->SetLagForCompactionBeforeTierings(TDuration::Seconds(1));
321+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1));
322+
csController->SetOverrideLagForCompactionBeforeTierings(TDuration::Seconds(1));
323323
csController->SetOverrideReduceMemoryIntervalLimit(1LLU << 30);
324324

325325
TLocalHelper(Kikimr).SetShardingMethod(ShardingType).CreateTestOlapTable("olapTable", "olapStore", 24, 4);

‎ydb/core/kqp/ut/olap/indexes_ut.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Y_UNIT_TEST_SUITE(KqpOlapIndexes) {
1717
TKikimrRunner kikimr(settings);
1818

1919
auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>();
20-
csController->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1));
21-
csController->SetLagForCompactionBeforeTierings(TDuration::Seconds(1));
20+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1));
21+
csController->SetOverrideLagForCompactionBeforeTierings(TDuration::Seconds(1));
2222
csController->SetOverrideReduceMemoryIntervalLimit(1LLU << 30);
2323

2424
TLocalHelper(kikimr).CreateTestOlapTable();
@@ -111,7 +111,7 @@ Y_UNIT_TEST_SUITE(KqpOlapIndexes) {
111111
TKikimrRunner kikimr(settings);
112112

113113
auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>();
114-
csController->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1));
114+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1));
115115

116116
TLocalHelper(kikimr).CreateTestOlapTable();
117117
auto tableClient = kikimr.GetTableClient();

‎ydb/core/kqp/ut/olap/kqp_olap_stats_ut.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ Y_UNIT_TEST_SUITE(KqpOlapStats) {
2121

2222
class TOlapStatsController : public NYDBTest::NColumnShard::TController {
2323
public:
24-
TDuration GetPeriodicWakeupActivationPeriod(const TDuration /*defaultValue*/) const override {
24+
TDuration DoGetPeriodicWakeupActivationPeriod(const TDuration /*defaultValue*/) const override {
2525
return TDuration::MilliSeconds(10);
2626
}
27-
TDuration GetStatsReportInterval(const TDuration /*defaultValue*/) const override {
27+
TDuration DoGetStatsReportInterval(const TDuration /*defaultValue*/) const override {
2828
return TDuration::MilliSeconds(10);
2929
}
3030
};

‎ydb/core/kqp/ut/olap/kqp_olap_ut.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2694,8 +2694,8 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
26942694
TLocalHelper testHelper(kikimr);
26952695

26962696
auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>();
2697-
csController->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1));
2698-
csController->SetLagForCompactionBeforeTierings(TDuration::Seconds(1));
2697+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1));
2698+
csController->SetOverrideLagForCompactionBeforeTierings(TDuration::Seconds(1));
26992699
csController->SetOverrideReduceMemoryIntervalLimit(1LLU << 30);
27002700
csController->DisableBackground(NKikimr::NYDBTest::ICSController::EBackground::Indexation);
27012701

‎ydb/core/kqp/ut/olap/sparsed_ut.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Y_UNIT_TEST_SUITE(KqpOlapSparsed) {
9595
void Execute() {
9696
CSController->DisableBackground(NKikimr::NYDBTest::ICSController::EBackground::Indexation);
9797
CSController->DisableBackground(NKikimr::NYDBTest::ICSController::EBackground::Compaction);
98-
CSController->SetPeriodicWakeupActivationPeriod(TDuration::MilliSeconds(100));
98+
CSController->SetOverridePeriodicWakeupActivationPeriod(TDuration::MilliSeconds(100));
9999

100100
Tests::NCommon::TLoggerInit(Kikimr).Initialize();
101101
TTypedLocalHelper helper("Utf8", Kikimr);

‎ydb/core/kqp/ut/olap/write_ut.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Y_UNIT_TEST_SUITE(KqpOlapWrite) {
1515
Y_UNIT_TEST(TierDraftsGC) {
1616
auto csController = NKikimr::NYDBTest::TControllers::RegisterCSControllerGuard<NKikimr::NYDBTest::NColumnShard::TController>();
1717
csController->SetIndexWriteControllerEnabled(false);
18-
csController->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1));
18+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1));
1919
Singleton<NKikimr::NWrappers::NExternalStorage::TFakeExternalStorage>()->ResetWriteCounters();
2020

2121
auto settings = TKikimrSettings()
@@ -50,7 +50,7 @@ Y_UNIT_TEST_SUITE(KqpOlapWrite) {
5050
Y_UNIT_TEST(TierDraftsGCWithRestart) {
5151
auto csController = NKikimr::NYDBTest::TControllers::RegisterCSControllerGuard<NKikimr::NYDBTest::NColumnShard::TController>();
5252
csController->SetIndexWriteControllerEnabled(false);
53-
csController->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1000));
53+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1000));
5454
csController->DisableBackground(NKikimr::NYDBTest::ICSController::EBackground::GC);
5555
Singleton<NKikimr::NWrappers::NExternalStorage::TFakeExternalStorage>()->ResetWriteCounters();
5656

@@ -133,7 +133,7 @@ Y_UNIT_TEST_SUITE(KqpOlapWrite) {
133133

134134
Y_UNIT_TEST(WriteDeleteCleanGC) {
135135
auto csController = NKikimr::NYDBTest::TControllers::RegisterCSControllerGuard<NKikimr::NYDBTest::NColumnShard::TController>();
136-
csController->SetPeriodicWakeupActivationPeriod(TDuration::MilliSeconds(100));
136+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::MilliSeconds(100));
137137
csController->DisableBackground(NKikimr::NYDBTest::ICSController::EBackground::GC);
138138
Singleton<NKikimr::NWrappers::NExternalStorage::TFakeExternalStorage>()->ResetWriteCounters();
139139

@@ -176,7 +176,7 @@ Y_UNIT_TEST_SUITE(KqpOlapWrite) {
176176
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx()).ExtractValueSync();
177177
UNIT_ASSERT_C(it.IsSuccess(), it.GetIssues().ToString());
178178
}
179-
csController->SetReadTimeoutClean(TDuration::Zero());
179+
csController->SetOverrideReadTimeoutClean(TDuration::Zero());
180180
csController->EnableBackground(NKikimr::NYDBTest::ICSController::EBackground::GC);
181181
{
182182
const TInstant start = TInstant::Now();

‎ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3265,8 +3265,8 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
32653265
auto session = Kikimr->GetTableClient().CreateSession().GetValueSync().GetSession();
32663266

32673267
auto csController = NYDBTest::TControllers::RegisterCSControllerGuard<NYDBTest::NColumnShard::TController>();
3268-
csController->SetPeriodicWakeupActivationPeriod(TDuration::Seconds(1));
3269-
csController->SetLagForCompactionBeforeTierings(TDuration::Seconds(1));
3268+
csController->SetOverridePeriodicWakeupActivationPeriod(TDuration::Seconds(1));
3269+
csController->SetOverrideLagForCompactionBeforeTierings(TDuration::Seconds(1));
32703270
csController->DisableBackground(NKikimr::NYDBTest::ICSController::EBackground::Indexation);
32713271

32723272
const TString query = Sprintf(R"(

‎ydb/core/protos/config.proto

+6
Original file line numberDiff line numberDiff line change
@@ -1550,6 +1550,12 @@ message TColumnShardConfig {
15501550

15511551
optional uint32 MaxInFlightIntervalsOnRequest = 16;
15521552
optional uint32 MaxReadStaleness_ms = 18 [default = 300000];
1553+
optional uint32 GCIntervalMs = 19 [default = 30000];
1554+
optional uint32 CompactionActualizationLagMs = 20 [default = 1000];
1555+
optional uint32 ActualizationTasksLagMs = 21 [default = 1000];
1556+
optional uint32 LagForCompactionBeforeTieringsMs = 22 [default = 3600000];
1557+
optional uint32 OptimizerFreshnessCheckDurationMs = 23 [default = 300000];
1558+
optional uint32 SmallPortionDetectSizeLimit = 24 [default = 1048576]; // 1 << 20
15531559
}
15541560

15551561
message TSchemeShardConfig {

‎ydb/core/tx/columnshard/blobs_action/bs/blob_manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ std::shared_ptr<NBlobOperations::NBlobStorage::TGCTask> TBlobManager::BuildGCTas
309309
return nullptr;
310310
}
311311

312-
if (AppData()->TimeProvider->Now() - PreviousGCTime < NYDBTest::TControllers::GetColumnShardController()->GetOverridenGCPeriod(TDuration::Seconds(GC_INTERVAL_SECONDS))) {
312+
if (AppData()->TimeProvider->Now() - PreviousGCTime < NYDBTest::TControllers::GetColumnShardController()->GetOverridenGCPeriod()) {
313313
ACFL_DEBUG("event", "TBlobManager::BuildGCTask skip")("current_gen", CurrentGen)("current_step", CurrentStep)("reason", "too_often");
314314
BlobsManagerCounters.GCCounters.SkipCollectionThrottling->Add(1);
315315
return nullptr;

‎ydb/core/tx/columnshard/blobs_action/bs/blob_manager.h

-3
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ struct TBlobManagerCounters {
133133

134134
// The implementation of BlobManager that hides all GC-related details
135135
class TBlobManager : public IBlobManager, public TCommonBlobsTracker {
136-
private:
137-
static constexpr ui64 GC_INTERVAL_SECONDS = 30;
138-
139136
private:
140137
using TBlobAddress = NBlobOperations::NBlobStorage::TBlobAddress;
141138
class TGCContext;

‎ydb/core/tx/columnshard/columnshard.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void TColumnShard::Handle(TEvPrivate::TEvReadFinished::TPtr& ev, const TActorCon
178178

179179
void TColumnShard::Handle(TEvPrivate::TEvPingSnapshotsUsage::TPtr& /*ev*/, const TActorContext& ctx) {
180180
if (auto writeTx = InFlightReadsTracker.Ping(
181-
this, NYDBTest::TControllers::GetColumnShardController()->GetPingCheckPeriod(0.6 * GetMaxReadStaleness()), TInstant::Now())) {
181+
this, NYDBTest::TControllers::GetColumnShardController()->GetPingCheckPeriod(), TInstant::Now())) {
182182
Execute(writeTx.release(), ctx);
183183
}
184184
ctx.Schedule(0.3 * GetMaxReadStaleness(), new TEvPrivate::TEvPingSnapshotsUsage());

‎ydb/core/tx/columnshard/columnshard_impl.cpp

+5-7
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@ TColumnShard::TColumnShard(TTabletStorageInfo* info, const TActorId& tablet)
7171
, ProgressTxController(std::make_unique<TTxController>(*this))
7272
, StoragesManager(std::make_shared<NOlap::TStoragesManager>(*this))
7373
, DataLocksManager(std::make_shared<NOlap::NDataLocks::TManager>())
74-
, PeriodicWakeupActivationPeriod(NYDBTest::TControllers::GetColumnShardController()->GetPeriodicWakeupActivationPeriod(
75-
TSettings::DefaultPeriodicWakeupActivationPeriod))
76-
, StatsReportInterval(NYDBTest::TControllers::GetColumnShardController()->GetStatsReportInterval(TSettings::DefaultStatsReportInterval))
74+
, PeriodicWakeupActivationPeriod(NYDBTest::TControllers::GetColumnShardController()->GetPeriodicWakeupActivationPeriod())
75+
, StatsReportInterval(NYDBTest::TControllers::GetColumnShardController()->GetStatsReportInterval())
7776
, InFlightReadsTracker(StoragesManager, Counters.GetRequestsTracingCounters())
7877
, TablesManager(StoragesManager, info->TabletID)
7978
, Subscribers(std::make_shared<NSubscriber::TManager>(*this))
@@ -680,8 +679,8 @@ void TColumnShard::SetupIndexation() {
680679
if (InsertTable->GetPathPriorities().size() && InsertTable->GetPathPriorities().rbegin()->first.GetCategory() == NOlap::TPathInfoIndexPriority::EIndexationPriority::PreventOverload) {
681680
force = true;
682681
}
683-
const ui64 bytesLimit = NYDBTest::TControllers::GetColumnShardController()->GetGuaranteeIndexationStartBytesLimit(TSettings::GuaranteeIndexationStartBytesLimit);
684-
const TDuration durationLimit = NYDBTest::TControllers::GetColumnShardController()->GetGuaranteeIndexationInterval(TSettings::GuaranteeIndexationInterval);
682+
const ui64 bytesLimit = NYDBTest::TControllers::GetColumnShardController()->GetGuaranteeIndexationStartBytesLimit();
683+
const TDuration durationLimit = NYDBTest::TControllers::GetColumnShardController()->GetGuaranteeIndexationInterval();
685684
if (!force && InsertTable->GetCountersCommitted().Bytes < bytesLimit &&
686685
TMonotonic::Now() < BackgroundController.GetLastIndexationInstant() + durationLimit) {
687686
AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "skip_indexation")("reason", "not_enough_data_and_too_frequency")
@@ -1145,8 +1144,7 @@ const NKikimr::NColumnShard::NTiers::TManager* TColumnShard::GetTierManagerPoint
11451144
}
11461145

11471146
TDuration TColumnShard::GetMaxReadStaleness() {
1148-
return NYDBTest::TControllers::GetColumnShardController()->GetReadTimeoutClean(
1149-
TDuration::MilliSeconds(AppDataVerified().ColumnShardConfig.GetMaxReadStaleness_ms()));
1147+
return NYDBTest::TControllers::GetColumnShardController()->GetReadTimeoutClean();
11501148
}
11511149

11521150
}

‎ydb/core/tx/columnshard/engines/column_engine_logs.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ std::vector<std::shared_ptr<TTTLColumnEngineChanges>> TColumnEngineForLogs::Star
421421

422422
TSaverContext saverContext(StoragesManager);
423423
NActualizer::TTieringProcessContext context(memoryUsageLimit, saverContext, dataLocksManager, SignalCounters, ActualizationController);
424-
const TDuration actualizationLag = NYDBTest::TControllers::GetColumnShardController()->GetActualizationTasksLag(TDuration::Seconds(1));
424+
const TDuration actualizationLag = NYDBTest::TControllers::GetColumnShardController()->GetActualizationTasksLag();
425425
for (auto&& i : pathEviction) {
426426
auto g = GetGranuleOptional(i.first);
427427
if (g) {

‎ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/context.h

+3-7
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,9 @@ class TSpecialReadContext {
4040
CacheFetchingScripts;
4141

4242
public:
43-
static const inline ui64 DefaultRejectMemoryIntervalLimit = TGlobalLimits::DefaultRejectMemoryIntervalLimit;
44-
static const inline ui64 DefaultReduceMemoryIntervalLimit = TGlobalLimits::DefaultReduceMemoryIntervalLimit;
45-
static const inline ui64 DefaultReadSequentiallyBufferSize = TGlobalLimits::DefaultReadSequentiallyBufferSize;
46-
47-
const ui64 ReduceMemoryIntervalLimit = NYDBTest::TControllers::GetColumnShardController()->GetReduceMemoryIntervalLimit(DefaultReduceMemoryIntervalLimit);
48-
const ui64 RejectMemoryIntervalLimit = NYDBTest::TControllers::GetColumnShardController()->GetRejectMemoryIntervalLimit(DefaultRejectMemoryIntervalLimit);
49-
const ui64 ReadSequentiallyBufferSize = DefaultReadSequentiallyBufferSize;
43+
const ui64 ReduceMemoryIntervalLimit = NYDBTest::TControllers::GetColumnShardController()->GetReduceMemoryIntervalLimit();
44+
const ui64 RejectMemoryIntervalLimit = NYDBTest::TControllers::GetColumnShardController()->GetRejectMemoryIntervalLimit();
45+
const ui64 ReadSequentiallyBufferSize = TGlobalLimits::DefaultReadSequentiallyBufferSize;
5046

5147
ui64 GetProcessMemoryControlId() const {
5248
AFL_VERIFY(ProcessMemoryGuard);

‎ydb/core/tx/columnshard/engines/storage/granule/storage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ std::shared_ptr<NKikimr::NOlap::TGranuleMeta> TGranulesStorage::GetGranuleForCom
88
std::map<NStorageOptimizer::TOptimizationPriority, std::shared_ptr<TGranuleMeta>> granulesSorted;
99
ui32 countChecker = 0;
1010
std::optional<NStorageOptimizer::TOptimizationPriority> priorityChecker;
11-
const TDuration actualizationLag = NYDBTest::TControllers::GetColumnShardController()->GetCompactionActualizationLag(TDuration::Seconds(1));
11+
const TDuration actualizationLag = NYDBTest::TControllers::GetColumnShardController()->GetCompactionActualizationLag();
1212
for (auto&& i : Tables) {
1313
NActors::TLogContextGuard lGuard = NActors::TLogContextBuilder::Build()("path_id", i.first);
1414
i.second->ActualizeOptimizer(now, actualizationLag);

‎ydb/core/tx/columnshard/engines/storage/optimizer/lbuckets/planner/optimizer.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
namespace NKikimr::NOlap::NStorageOptimizer::NLBuckets {
44

55
TDuration GetCommonFreshnessCheckDuration() {
6-
static const TDuration CommonFreshnessCheckDuration = TDuration::Seconds(300);
7-
return NYDBTest::TControllers::GetColumnShardController()->GetOptimizerFreshnessCheckDuration(CommonFreshnessCheckDuration);
6+
return NYDBTest::TControllers::GetColumnShardController()->GetOptimizerFreshnessCheckDuration();
87
}
98

109
}

‎ydb/core/tx/columnshard/engines/storage/optimizer/lbuckets/planner/optimizer.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
namespace NKikimr::NOlap::NStorageOptimizer::NLBuckets {
2121

22-
static const ui64 SmallPortionDetectSizeLimit = 1 << 20;
23-
2422
TDuration GetCommonFreshnessCheckDuration();
2523

2624
class TSimplePortionsGroupInfo {
@@ -683,7 +681,7 @@ class TPortionsBucket: public TMoveOnly {
683681
return;
684682
}
685683
MainPortion->InitRuntimeFeature(TPortionInfo::ERuntimeFeature::Optimized, Others.IsEmpty() && currentInstant > MainPortion->RecordSnapshotMax().GetPlanInstant() +
686-
NYDBTest::TControllers::GetColumnShardController()->GetLagForCompactionBeforeTierings(TDuration::Minutes(60)));
684+
NYDBTest::TControllers::GetColumnShardController()->GetLagForCompactionBeforeTierings());
687685
}
688686
public:
689687
TTaskDescription GetTaskDescription() const {
@@ -1104,7 +1102,7 @@ class TPortionBuckets {
11041102
}
11051103

11061104
void RemovePortion(const std::shared_ptr<TPortionInfo>& portion) {
1107-
if (portion->GetTotalBlobBytes() < NYDBTest::TControllers::GetColumnShardController()->GetSmallPortionSizeDetector(SmallPortionDetectSizeLimit)) {
1105+
if (portion->GetTotalBlobBytes() < NYDBTest::TControllers::GetColumnShardController()->GetSmallPortionSizeDetector()) {
11081106
Counters->SmallPortions->RemovePortion(portion);
11091107
}
11101108
if (!RemoveBucket(portion)) {
@@ -1146,7 +1144,7 @@ class TPortionBuckets {
11461144
}
11471145

11481146
void AddPortion(const std::shared_ptr<TPortionInfo>& portion, const TInstant now) {
1149-
if (portion->GetTotalBlobBytes() < NYDBTest::TControllers::GetColumnShardController()->GetSmallPortionSizeDetector(SmallPortionDetectSizeLimit)) {
1147+
if (portion->GetTotalBlobBytes() < NYDBTest::TControllers::GetColumnShardController()->GetSmallPortionSizeDetector()) {
11501148
Counters->SmallPortions->AddPortion(portion);
11511149
AddOther(portion, now);
11521150
return;

‎ydb/core/tx/columnshard/engines/storage/optimizer/sbuckets/common/optimizer.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
namespace NKikimr::NOlap::NStorageOptimizer::NSBuckets {
55

66
TDuration GetCommonFreshnessCheckDuration() {
7-
static const TDuration CommonFreshnessCheckDuration = TDuration::Seconds(300);
8-
return NYDBTest::TControllers::GetColumnShardController()->GetOptimizerFreshnessCheckDuration(CommonFreshnessCheckDuration);
7+
return NYDBTest::TControllers::GetColumnShardController()->GetOptimizerFreshnessCheckDuration();
98
}
109

11-
}
10+
} // namespace NKikimr::NOlap::NStorageOptimizer::NSBuckets

0 commit comments

Comments
 (0)