@@ -7321,10 +7321,8 @@ void TSchemeShard::Handle(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr&
7321
7321
}
7322
7322
7323
7323
void TSchemeShard::Handle (TEvPrivate::TEvSendBaseStatsToSA::TPtr&, const TActorContext& ctx) {
7324
- SendBaseStatsToSA ();
7325
- auto seconds = SendStatsIntervalMaxSeconds - SendStatsIntervalMinSeconds;
7326
- ctx.Schedule (TDuration::Seconds (SendStatsIntervalMinSeconds + RandomNumber<ui64>(seconds)),
7327
- new TEvPrivate::TEvSendBaseStatsToSA ());
7324
+ TDuration delta = SendBaseStatsToSA ();
7325
+ ctx.Schedule (delta, new TEvPrivate::TEvSendBaseStatsToSA ());
7328
7326
}
7329
7327
7330
7328
void TSchemeShard::InitializeStatistics (const TActorContext& ctx) {
@@ -7371,15 +7369,15 @@ void TSchemeShard::ConnectToSA() {
7371
7369
<< " , at schemeshard: " << TabletID ());
7372
7370
}
7373
7371
7374
- void TSchemeShard::SendBaseStatsToSA () {
7372
+ TDuration TSchemeShard::SendBaseStatsToSA () {
7375
7373
if (!EnableStatistics) {
7376
- return ;
7374
+ return TDuration::Max () ;
7377
7375
}
7378
7376
7379
7377
if (!SAPipeClientId) {
7380
7378
ResolveSA ();
7381
7379
if (!StatisticsAggregatorId) {
7382
- return ;
7380
+ return TDuration::Seconds ( 30 ) ;
7383
7381
}
7384
7382
}
7385
7383
@@ -7411,6 +7409,13 @@ void TSchemeShard::SendBaseStatsToSA() {
7411
7409
++count;
7412
7410
}
7413
7411
7412
+ if (!count) {
7413
+ LOG_DEBUG_S (TlsActivationContext->AsActorContext (), NKikimrServices::STATISTICS,
7414
+ " SendBaseStatsToSA() No tables to send"
7415
+ << " , at schemeshard: " << TabletID ());
7416
+ return TDuration::Seconds (30 );
7417
+ }
7418
+
7414
7419
TString stats;
7415
7420
stats.clear ();
7416
7421
Y_PROTOBUF_SUPPRESS_NODISCARD record.SerializeToString (&stats);
@@ -7425,6 +7430,9 @@ void TSchemeShard::SendBaseStatsToSA() {
7425
7430
" SendBaseStatsToSA()"
7426
7431
<< " , path count: " << count
7427
7432
<< " , at schemeshard: " << TabletID ());
7433
+
7434
+ return TDuration::Seconds (SendStatsIntervalMinSeconds
7435
+ + RandomNumber<ui64>(SendStatsIntervalMaxSeconds - SendStatsIntervalMinSeconds));
7428
7436
}
7429
7437
7430
7438
} // namespace NSchemeShard
0 commit comments