@@ -1780,8 +1780,10 @@ bool THive::IsTabletMoveExpedient(const TTabletInfo& tablet, const TNodeInfo& no
1780
1780
return result;
1781
1781
}
1782
1782
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) {
1784
1784
if (info) {
1785
+ TInstant now = TActivationContext::Now ();
1786
+ TInstant restartsBarrierTime = now - GetTabletRestartsPeriod ();
1785
1787
auto & tabletInfo = *response.AddTablets ();
1786
1788
tabletInfo.SetTabletID (tabletId);
1787
1789
tabletInfo.SetTabletType (info->Type );
@@ -1843,8 +1845,6 @@ void THive::FillTabletInfo(NKikimrHive::TEvResponseHiveInfo& response, ui64 tabl
1843
1845
void THive::Handle (TEvHive::TEvRequestHiveInfo::TPtr& ev) {
1844
1846
const auto & record = ev->Get ()->Record ;
1845
1847
TAutoPtr<TEvHive::TEvResponseHiveInfo> response = new TEvHive::TEvResponseHiveInfo ();
1846
- TInstant now = TlsActivationContext->Now ();
1847
- TInstant restartsBarrierTime = now - GetTabletRestartsPeriod ();
1848
1848
if (record.HasTabletID ()) {
1849
1849
TTabletId tabletId = record.GetTabletID ();
1850
1850
NKikimrHive::TForwardRequest forwardRequest;
@@ -1853,7 +1853,7 @@ void THive::Handle(TEvHive::TEvRequestHiveInfo::TPtr& ev) {
1853
1853
}
1854
1854
const TLeaderTabletInfo* tablet = FindTablet (tabletId);
1855
1855
if (tablet) {
1856
- FillTabletInfo (response->Record , record.GetTabletID (), tablet, record, restartsBarrierTime );
1856
+ FillTabletInfo (response->Record , record.GetTabletID (), tablet, record);
1857
1857
} else {
1858
1858
BLOG_W (" Can't find the tablet from RequestHiveInfo(TabletID=" << tabletId << " )" );
1859
1859
}
@@ -1866,7 +1866,7 @@ void THive::Handle(TEvHive::TEvRequestHiveInfo::TPtr& ev) {
1866
1866
if (it->second .IsDeleting ()) {
1867
1867
continue ;
1868
1868
}
1869
- FillTabletInfo (response->Record , it->first , &it->second , record, restartsBarrierTime );
1869
+ FillTabletInfo (response->Record , it->first , &it->second , record);
1870
1870
}
1871
1871
response->Record .set_starttimetimestamp (StartTime ().MilliSeconds ());
1872
1872
response->Record .set_responsetimestamp (TAppData::TimeProvider->Now ().MilliSeconds ());
0 commit comments