Merge 9ed6602 into 9b567af

Author: azevaykin

ydb/core/statistics/aggregator/tx_init.cpp

@@ -227,7 +227,12 @@ struct TStatisticsAggregator::TTxInit : public TTxBase {
                 ui64 ownerId = rowset.GetValue<Schema::ForceTraversalTables::OwnerId>();
                 ui64 localPathId = rowset.GetValue<Schema::ForceTraversalTables::LocalPathId>();
                 TString columnTags = rowset.GetValue<Schema::ForceTraversalTables::ColumnTags>();
-                ui64 status = rowset.GetValue<Schema::ForceTraversalTables::Status>();
+                TForceTraversalTable::EStatus status = (TForceTraversalTable::EStatus)rowset.GetValue<Schema::ForceTraversalTables::Status>();
+
+                if (status == TForceTraversalTable::EStatus::AnalyzeStarted) {
+                    // Resent TEvAnalyzeTable to shards
+                    status = TForceTraversalTable::EStatus::None;
+                }
 
                 auto pathId = TPathId(ownerId, localPathId);
 
@@ -270,7 +275,7 @@ struct TStatisticsAggregator::TTxInit : public TTxBase {
 
         Self->InitializeStatisticsTable();
 
-        if (Self->TraversalPathId) {
+        if (Self->TraversalPathId && Self->TraversalStartKey) {
             Self->NavigateType = ENavigateType::Traversal;
             Self->NavigatePathId = Self->TraversalPathId;
             Self->Navigate();

ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp

@@ -117,6 +117,34 @@ Y_UNIT_TEST_SUITE(AnalyzeColumnshard) {
         UNIT_ASSERT(!response2);
     }
 
+    Y_UNIT_TEST(AnalyzeRebootSa) {
+        TTestEnv env(1, 1);
+        auto& runtime = *env.GetServer().GetRuntime();
+        auto tableInfo = CreateDatabaseTables(env, 1, 1)[0];
+
+        auto sender = runtime.AllocateEdgeActor();
+
+        bool eventSeen = false;
+        auto observer = runtime.AddObserver<TEvStatistics::TEvAnalyzeTableResponse>([&](auto&) {
+            if (!eventSeen) {
+                RebootTablet(runtime, tableInfo.SaTabletId, sender);
+                eventSeen = true;
+            }
+        });
+
+        auto analyzeRequest1 = MakeAnalyzeRequest({tableInfo.PathId});
+        runtime.SendToPipe(tableInfo.SaTabletId, sender, analyzeRequest1.release());
+
+        runtime.WaitFor("blocked 1st TEvAnalyzeTableResponse event", [&]{ return eventSeen; });
+
+        RebootTablet(runtime, tableInfo.SaTabletId, sender);
+
+        auto analyzeRequest2 = MakeAnalyzeRequest({tableInfo.PathId});
+        runtime.SendToPipe(tableInfo.SaTabletId, sender, analyzeRequest2.release());
+
+        runtime.GrabEdgeEventRethrow<TEvStatistics::TEvAnalyzeResponse>(sender);
+    }    
+
 }
 
 } // NStat