Skip to content

Commit 5ea5e84

Browse files
committed
remove argument FillTabletInfo
1 parent 06bfeda commit 5ea5e84

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ydb/core/mind/hive/hive_impl.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1780,8 +1780,10 @@ bool THive::IsTabletMoveExpedient(const TTabletInfo& tablet, const TNodeInfo& no
17801780
return result;
17811781
}
17821782

1783-
void THive::FillTabletInfo(NKikimrHive::TEvResponseHiveInfo& response, ui64 tabletId, const TLeaderTabletInfo *info, const NKikimrHive::TEvRequestHiveInfo &req, TInstant restartsBarrierTime) {
1783+
void THive::FillTabletInfo(NKikimrHive::TEvResponseHiveInfo& response, ui64 tabletId, const TLeaderTabletInfo *info, const NKikimrHive::TEvRequestHiveInfo &req) {
17841784
if (info) {
1785+
TInstant now = TActivationContext::Now();
1786+
TInstant restartsBarrierTime = now - GetTabletRestartsPeriod();
17851787
auto& tabletInfo = *response.AddTablets();
17861788
tabletInfo.SetTabletID(tabletId);
17871789
tabletInfo.SetTabletType(info->Type);
@@ -1843,8 +1845,6 @@ void THive::FillTabletInfo(NKikimrHive::TEvResponseHiveInfo& response, ui64 tabl
18431845
void THive::Handle(TEvHive::TEvRequestHiveInfo::TPtr& ev) {
18441846
const auto& record = ev->Get()->Record;
18451847
TAutoPtr<TEvHive::TEvResponseHiveInfo> response = new TEvHive::TEvResponseHiveInfo();
1846-
TInstant now = TlsActivationContext->Now();
1847-
TInstant restartsBarrierTime = now - GetTabletRestartsPeriod();
18481848
if (record.HasTabletID()) {
18491849
TTabletId tabletId = record.GetTabletID();
18501850
NKikimrHive::TForwardRequest forwardRequest;
@@ -1853,7 +1853,7 @@ void THive::Handle(TEvHive::TEvRequestHiveInfo::TPtr& ev) {
18531853
}
18541854
const TLeaderTabletInfo* tablet = FindTablet(tabletId);
18551855
if (tablet) {
1856-
FillTabletInfo(response->Record, record.GetTabletID(), tablet, record, restartsBarrierTime);
1856+
FillTabletInfo(response->Record, record.GetTabletID(), tablet, record);
18571857
} else {
18581858
BLOG_W("Can't find the tablet from RequestHiveInfo(TabletID=" << tabletId << ")");
18591859
}
@@ -1866,7 +1866,7 @@ void THive::Handle(TEvHive::TEvRequestHiveInfo::TPtr& ev) {
18661866
if (it->second.IsDeleting()) {
18671867
continue;
18681868
}
1869-
FillTabletInfo(response->Record, it->first, &it->second, record, restartsBarrierTime);
1869+
FillTabletInfo(response->Record, it->first, &it->second, record);
18701870
}
18711871
response->Record.set_starttimetimestamp(StartTime().MilliSeconds());
18721872
response->Record.set_responsetimestamp(TAppData::TimeProvider->Now().MilliSeconds());

ydb/core/mind/hive/hive_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ class THive : public TActor<THive>, public TTabletExecutedFlat, public THiveShar
665665
const NKikimrTabletBase::TMetrics& after,
666666
NKikimr::NHive::TResourceRawValues deltaRaw,
667667
NKikimr::NHive::TResourceNormalizedValues deltaNormalized);
668-
static void FillTabletInfo(NKikimrHive::TEvResponseHiveInfo& response, ui64 tabletId, const TLeaderTabletInfo* info, const NKikimrHive::TEvRequestHiveInfo& req, TInstant restartsBarrierTime);
668+
void FillTabletInfo(NKikimrHive::TEvResponseHiveInfo& response, ui64 tabletId, const TLeaderTabletInfo* info, const NKikimrHive::TEvRequestHiveInfo& req);
669669
void ExecuteStartTablet(TFullTabletId tabletId, const TActorId& local, ui64 cookie, bool external);
670670
ui32 GetDataCenters();
671671
ui32 GetRegisteredDataCenters();

0 commit comments

Comments
 (0)