Add TabletId and Status to TEvForceDataCleanupResult (#14380)

ydb-platform · Feb 10, 2025 · e220453 · e220453
1 parent da88f78
commit e220453
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/ydb/core/protos/tx_datashard.proto b/ydb/core/protos/tx_datashard.proto
@@ -2279,5 +2279,11 @@ message TEvForceDataCleanup {
 // Returns DataCleanupGeneration of the last successfully completed TEvForceDataCleanup request.
 // Intermediate requests and corresponding TEvForceDataCleanupResult's may be skipped.
 message TEvForceDataCleanupResult {
-    optional uint64 DataCleanupGeneration = 1; // from corresponding request
+    enum EStatus {
+        OK = 0;
+        FAILED = 1;
+    };
+    optional uint64 DataCleanupGeneration = 1; // from corresponding request (or greater)
+    optional uint64 TabletId = 2;
+    optional EStatus Status = 3;
 }
diff --git a/ydb/core/tx/datashard/datashard.h b/ydb/core/tx/datashard/datashard.h
@@ -1578,8 +1578,10 @@ namespace TEvDataShard {
                                                 TEvDataShard::EvForceDataCleanupResult> {
         TEvForceDataCleanupResult() = default;
 
-        TEvForceDataCleanupResult(ui64 dataCleanupGeneration) {
+        TEvForceDataCleanupResult(ui64 dataCleanupGeneration, ui64 tabletId, NKikimrTxDataShard::TEvForceDataCleanupResult::EStatus status) {
             Record.SetDataCleanupGeneration(dataCleanupGeneration);
+            Record.SetTabletId(tabletId);
+            Record.SetStatus(status);
         }
     };
 

diff --git a/ydb/core/tx/datashard/datashard__data_cleanup.cpp b/ydb/core/tx/datashard/datashard__data_cleanup.cpp
@@ -5,7 +5,10 @@ namespace NKikimr::NDataShard {
 void TDataShard::Handle(TEvDataShard::TEvForceDataCleanup::TPtr& ev, const TActorContext& ctx) {
     // TODO: implement
     const auto& record = ev->Get()->Record;
-    auto result = MakeHolder<TEvDataShard::TEvForceDataCleanupResult>(record.GetDataCleanupGeneration());
+    auto result = MakeHolder<TEvDataShard::TEvForceDataCleanupResult>(
+        record.GetDataCleanupGeneration(),
+        TabletID(),
+        NKikimrTxDataShard::TEvForceDataCleanupResult::OK);
     ctx.Send(ev->Sender, std::move(result));
 }
 

diff --git a/ydb/core/tx/datashard/datashard_ut_data_cleanup.cpp b/ydb/core/tx/datashard/datashard_ut_data_cleanup.cpp
@@ -26,6 +26,8 @@ Y_UNIT_TEST_SUITE(DataCleanup) {
 
         auto ev = runtime.GrabEdgeEventRethrow<TEvDataShard::TEvForceDataCleanupResult>(sender);
         UNIT_ASSERT_VALUES_EQUAL(ev->Get()->Record.GetDataCleanupGeneration(), expectedDataCleanupGeneration);
+        UNIT_ASSERT_VALUES_EQUAL(ev->Get()->Record.GetTabletId(), shards.at(0));
+        UNIT_ASSERT_EQUAL(ev->Get()->Record.GetStatus(), NKikimrTxDataShard::TEvForceDataCleanupResult::OK);
     }
 }