Skip to content

Commit c683f07

Browse files
authored
Run OnTieringModified only once on tablet initialization (#951)
1 parent db4e909 commit c683f07

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

ydb/core/tx/columnshard/columnshard.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ void TColumnShard::SwitchToWork(const TActorContext& ctx) {
3636
AFL_INFO(NKikimrServices::TX_COLUMNSHARD)("event", "initialize_shard")("step", "SwitchToWork");
3737

3838
for (auto&& i : TablesManager.GetTables()) {
39-
ActivateTiering(i.first, i.second.GetTieringUsage());
39+
ActivateTiering(i.first, i.second.GetTieringUsage(), true);
4040
}
41+
OnTieringModified();
4142

4243
Become(&TThis::StateWork);
4344
SignalTabletActive(ctx);

ydb/core/tx/columnshard/columnshard_impl.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ void TColumnShard::Handle(NMetadata::NProvider::TEvRefreshSubscriberData::TPtr&
947947
Tiers->TakeConfigs(ev->Get()->GetSnapshot(), nullptr);
948948
}
949949

950-
void TColumnShard::ActivateTiering(const ui64 pathId, const TString& useTiering) {
950+
void TColumnShard::ActivateTiering(const ui64 pathId, const TString& useTiering, const bool onTabletInit) {
951951
Y_ABORT_UNLESS(!!Tiers);
952952
if (!!Tiers) {
953953
if (useTiering) {
@@ -956,7 +956,9 @@ void TColumnShard::ActivateTiering(const ui64 pathId, const TString& useTiering)
956956
Tiers->DisablePathId(pathId);
957957
}
958958
}
959-
OnTieringModified();
959+
if (!onTabletInit) {
960+
OnTieringModified();
961+
}
960962
}
961963

962964
void TColumnShard::Enqueue(STFUNC_SIG) {

ydb/core/tx/columnshard/columnshard_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ class TColumnShard
206206
TabletCounters->Percentile()[counter].IncrementFor(latency.MicroSeconds());
207207
}
208208

209-
void ActivateTiering(const ui64 pathId, const TString& useTiering);
209+
void ActivateTiering(const ui64 pathId, const TString& useTiering, const bool onTabletInit = false);
210210
void OnTieringModified();
211211
public:
212212
enum class EOverloadStatus {

0 commit comments

Comments
 (0)