Merge 3214a90 into 83c2452

Author: MBkkt

ydb/core/protos/index_builder.proto

@@ -109,7 +109,7 @@ message TEvListResponse {
 
 enum EBuildStatus {
     INVALID = 0;
-    ACCEPTED = 1;
+    ACCEPTED = 1; // DEPRECATED don't use it, it does nothing, we cannot remove it for now, because old nodes can send it
     IN_PROGRESS = 2;
     DONE = 3;
 

ydb/core/tx/datashard/build_index.cpp

@@ -628,15 +628,14 @@ void TDataShard::HandleSafe(TEvDataShard::TEvBuildIndexCreateRequest::TPtr& ev,
         return;
     }
 
-    auto response = MakeHolder<TEvDataShard::TEvBuildIndexProgressResponse>();
-    response->Record.SetBuildIndexId(record.GetBuildIndexId());
-    response->Record.SetTabletId(TabletID());
-    response->Record.SetStatus(NKikimrIndexBuilder::EBuildStatus::ACCEPTED);
 
     TScanRecord::TSeqNo seqNo = {record.GetSeqNoGeneration(), record.GetSeqNoRound()};
-    response->Record.SetRequestSeqNoGeneration(seqNo.Generation);
-    response->Record.SetRequestSeqNoRound(seqNo.Round);
     auto badRequest = [&](const TString& error) {
+        auto response = MakeHolder<TEvDataShard::TEvBuildIndexProgressResponse>();
+        response->Record.SetBuildIndexId(record.GetBuildIndexId());
+        response->Record.SetTabletId(TabletID());
+        response->Record.SetRequestSeqNoGeneration(seqNo.Generation);
+        response->Record.SetRequestSeqNoRound(seqNo.Round);
         response->Record.SetStatus(NKikimrIndexBuilder::EBuildStatus::BAD_REQUEST);
         auto issue = response->Record.AddIssues();
         issue->set_severity(NYql::TSeverityIds::S_ERROR);
@@ -663,7 +662,6 @@ void TDataShard::HandleSafe(TEvDataShard::TEvBuildIndexCreateRequest::TPtr& ev,
     if (const auto* recCard = ScanManager.Get(buildIndexId)) {
         if (recCard->SeqNo == seqNo) {
             // do no start one more scan
-            ctx.Send(ev->Sender, std::move(response));
             return;
         }
 
@@ -738,8 +736,6 @@ void TDataShard::HandleSafe(TEvDataShard::TEvBuildIndexCreateRequest::TPtr& ev,
     TScanRecord recCard = {scanId, seqNo};
 
     ScanManager.Set(buildIndexId, recCard);
-
-    ctx.Send(ev->Sender, std::move(response));
 }
 
 }