Merge 1712a96 into de5cc2a

Author: alexd65536

ydb/core/protos/feature_flags.proto

@@ -118,7 +118,7 @@ message TFeatureFlags {
     optional bool SuppressCompatibilityCheck = 103 [default = false];
     optional bool EnableUniqConstraint = 104 [default = true];
     optional bool EnableChangefeedDebeziumJsonFormat = 105 [default = false];
-    optional bool EnableStatistics = 106 [default = false];
+    optional bool EnableStatistics = 106 [default = true];
     optional bool EnableUuidAsPrimaryKey = 107 [default = true];
     optional bool EnableTablePgTypes = 108 [default = false];
     optional bool EnableLocalDBBtreeIndex = 109 [default = false];

ydb/core/statistics/stat_service.cpp

@@ -298,7 +298,7 @@ class TStatService : public TActorBootstrapped<TStatService> {
         request.StatType = ev->Get()->StatType;
         request.StatRequests.swap(ev->Get()->StatRequests);
 
-        if (!EnableStatistics) {
+        if (!EnableStatistics || IsStatisticsDisabledInSA) {
             ReplyFailed(requestId, true);
             return;
         }
@@ -463,6 +463,8 @@ class TStatService : public TActorBootstrapped<TStatService> {
 
         Send(ev->Sender, new TEvStatistics::TEvPropagateStatisticsResponse);
 
+        IsStatisticsDisabledInSA = false;
+
         auto* record = ev->Get()->MutableRecord();
         for (const auto& entry : record->GetEntries()) {
             ui64 schemeShardId = entry.GetSchemeShardId();
@@ -547,6 +549,7 @@ class TStatService : public TActorBootstrapped<TStatService> {
             << ", status = " << ev->Get()->Status);
 
         if (ev->Get()->Status != NKikimrProto::OK) {
+            IsStatisticsDisabledInSA = false;
             SAPipeClientId = TActorId();
             ConnectToSA();
             SyncNode();
@@ -560,12 +563,14 @@ class TStatService : public TActorBootstrapped<TStatService> {
             << ", client id = " << ev->Get()->ClientId
             << ", server id = " << ev->Get()->ServerId);
 
+        IsStatisticsDisabledInSA = false;
         SAPipeClientId = TActorId();
         ConnectToSA();
         SyncNode();
     }
 
     void Handle(TEvStatistics::TEvStatisticsIsDisabled::TPtr&) {
+        IsStatisticsDisabledInSA = true;
         ReplyAllFailed();
     }
 
@@ -839,6 +844,7 @@ class TStatService : public TActorBootstrapped<TStatService> {
 private:
     bool EnableStatistics = false;
     bool EnableColumnStatistics = false;
+    bool IsStatisticsDisabledInSA = false;
 
     static constexpr size_t StatFanOut = 10;