fix issues

ydb-platform · Aug 7, 2024 · 18d394b · 18d394b
1 parent 304ce5d
commit 18d394b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 20 deletions.
diff --git a/cloud/filestore/libs/storage/tablet/model/compaction_map.cpp b/cloud/filestore/libs/storage/tablet/model/compaction_map.cpp
@@ -277,7 +277,6 @@ struct TCompactionMap::TImpl
         }
 
         for (ui32 i = startIndex; i < endIndex; ++i) {
-
             TotalBlobsCount -= group->Get(ranges[i].RangeId).BlobsCount;
             TotalDeletionsCount -= group->Get(ranges[i].RangeId).DeletionsCount;
 

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_delete_zero_compaction_ranges.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_delete_zero_compaction_ranges.cpp
@@ -51,10 +51,10 @@ void TIndexTabletActor::ExecuteTx_DeleteZeroCompactionRanges(
 
     TVector<ui32> ranges(
         Reserve(Config->GetMaxZeroCompactionRangesToDeletePerTx()));
-    ui32 rangesCount = RangesWithEmptyCompactionScore.size();
+    ui32 rangeCount = RangesWithEmptyCompactionScore.size();
     ui32 rangesPerTx = Config->GetMaxZeroCompactionRangesToDeletePerTx();
     for (ui32 i = args.StartIndex;
-            i < Min<ui32>(args.StartIndex + rangesPerTx, rangesCount); i++)
+            i < Min<ui32>(args.StartIndex + rangesPerTx, rangeCount); ++i)
     {
         ui32 range = RangesWithEmptyCompactionScore[i];
         db.WriteCompactionMap(

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_monitoring.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_monitoring.cpp
@@ -1214,7 +1214,11 @@ void TIndexTabletActor::HandleHttpInfo_ForceOperation(
         mode = TEvIndexTabletPrivate::EForcedRangeOperationMode
             ::DeleteZeroCompactionRanges;
     } else {
-        RejectHttpRequest(ctx, TabletID(), *requestInfo, "Invalid mode");
+        RejectHttpRequest(
+            ctx,
+            TabletID(),
+            *requestInfo,
+            TStringBuilder() << "Invalid mode: " << params.Get("mode"));
         return;
     }
 
@@ -1239,7 +1243,8 @@ void TIndexTabletActor::HandleHttpInfo_ForceOperation(
                 1));
     } else {
         if (mode == TEvIndexTabletPrivate::EForcedRangeOperationMode
-                ::DeleteZeroCompactionRanges) {
+                ::DeleteZeroCompactionRanges)
+        {
             ranges = RangesWithEmptyCompactionScore;
         } else {
             ranges = GetNonEmptyCompactionRanges();

diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_write_compactionmap.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_write_compactionmap.cpp
@@ -21,8 +21,8 @@ void TIndexTabletActor::HandleWriteCompactionMap(
         msg->CallContext);
 
     TVector<NProtoPrivate::TCompactionRangeStats> ranges(
-        msg->Record.GetRanges().size());
-    for (auto& range: msg->Record.GetRanges()) {
+        Reserve(msg->Record.GetRanges().size()));
+    for (const auto& range: msg->Record.GetRanges()) {
         ranges.push_back(range);
     }
 
@@ -54,7 +54,7 @@ void TIndexTabletActor::ExecuteTx_WriteCompactionMap(
     Y_UNUSED(ctx);
 
     TIndexTabletDatabase db(tx.DB);
-    for (auto range: args.Ranges) {
+    for (const auto& range: args.Ranges) {
         db.ForceWriteCompactionMap(
             range.GetRangeId(),
             range.GetBlobCount(),

diff --git a/cloud/filestore/libs/storage/tablet/tablet_database.h b/cloud/filestore/libs/storage/tablet/tablet_database.h
@@ -9,7 +9,6 @@
 #include <cloud/filestore/libs/storage/tablet/model/compaction_map.h>
 #include <cloud/filestore/libs/storage/tablet/model/deletion_markers.h>
 #include <cloud/filestore/libs/storage/tablet/protos/tablet.pb.h>
-#include <cloud/filestore/private/api/protos/tablet.pb.h>
 
 #include <cloud/storage/core/libs/tablet/model/commit.h>
 #include <cloud/storage/core/libs/tablet/model/partial_blob_id.h>

diff --git a/cloud/filestore/libs/storage/tablet/tablet_private.h b/cloud/filestore/libs/storage/tablet/tablet_private.h
@@ -11,7 +11,6 @@
 #include <cloud/filestore/libs/storage/model/range.h>
 #include <cloud/filestore/libs/storage/tablet/model/blob.h>
 #include <cloud/filestore/libs/storage/tablet/model/block.h>
-#include <cloud/filestore/libs/storage/tablet/model/compaction_map.h>
 
 #include <contrib/ydb/core/base/blobstorage.h>
 
@@ -439,7 +438,7 @@ struct TEvIndexTabletPrivate
     {
         const ui32 RangeId;
 
-        TDeleteZeroCompactionRangesRequest(ui32 rangeId)
+        explicit TDeleteZeroCompactionRangesRequest(ui32 rangeId)
             : RangeId(rangeId)
         {}
     };

diff --git a/cloud/filestore/libs/storage/tablet/tablet_tx.h b/cloud/filestore/libs/storage/tablet/tablet_tx.h
@@ -1655,9 +1655,11 @@ struct TTxIndexTablet
     struct TDeleteZeroCompactionRanges
     {
         const TRequestInfoPtr RequestInfo;
-        ui32 StartIndex;
+        const ui32 StartIndex;
 
-        TDeleteZeroCompactionRanges(TRequestInfoPtr requestInfo, ui32 startIndex)
+        TDeleteZeroCompactionRanges(
+                TRequestInfoPtr requestInfo,
+                ui32 startIndex)
             : RequestInfo(std::move(requestInfo))
             , StartIndex(startIndex)
         {}
@@ -1674,11 +1676,11 @@ struct TTxIndexTablet
     struct TWriteCompactionMap
     {
         const TRequestInfoPtr RequestInfo;
-        TVector<NProtoPrivate::TCompactionRangeStats> Ranges;
+        const TVector<NProtoPrivate::TCompactionRangeStats> Ranges;
 
         TWriteCompactionMap(
                 TRequestInfoPtr requestInfo,
-                const TVector<NProtoPrivate::TCompactionRangeStats>& ranges)
+                TVector<NProtoPrivate::TCompactionRangeStats> ranges)
             : RequestInfo(std::move(requestInfo))
             , Ranges(std::move(ranges))
         {}

diff --git a/cloud/filestore/libs/storage/tablet/tablet_ut_data.cpp b/cloud/filestore/libs/storage/tablet/tablet_ut_data.cpp
@@ -3304,12 +3304,16 @@ Y_UNIT_TEST_SUITE(TIndexTabletTest_Data)
 
         ui32 requests = 0;
         ui32 lastCompactionMapRangeId = 0;
-        env.GetRuntime().SetEventFilter([&] (auto& runtime, TAutoPtr<IEventHandle>& event) {
+        env.GetRuntime().SetEventFilter(
+            [&] (auto& runtime, TAutoPtr<IEventHandle>& event)
+        {
             Y_UNUSED(runtime);
 
             switch (event->GetTypeRewrite()) {
-                case TEvIndexTabletPrivate::EvDeleteZeroCompactionRangesRequest: {
-                    requests++;
+                case TEvIndexTabletPrivate
+                    ::EvDeleteZeroCompactionRangesRequest:
+                {
+                    ++requests;
                     break;
                 }
                 case TEvIndexTabletPrivate::EvLoadCompactionMapChunkCompleted: {
@@ -3360,13 +3364,15 @@ Y_UNIT_TEST_SUITE(TIndexTabletTest_Data)
         tablet.WriteCompactionMap(ranges);
         tablet.RebootTablet();
 
-        tablet.ForcedOperation(NProtoPrivate::TForcedOperationRequest::E_DELETE_EMPTY_RANGES);
+        tablet.ForcedOperation(
+            NProtoPrivate::TForcedOperationRequest::E_DELETE_EMPTY_RANGES);
 
         UNIT_ASSERT_VALUES_EQUAL(requests, 15);
         UNIT_ASSERT_VALUES_EQUAL(lastCompactionMapRangeId, 199);
         tablet.AssertForcedRangeOperationFailed(
             TVector<ui32>{},
-            TEvIndexTabletPrivate::EForcedRangeOperationMode::DeleteZeroCompactionRanges);
+            TEvIndexTabletPrivate
+                ::EForcedRangeOperationMode::DeleteZeroCompactionRanges);
 
         lastCompactionMapRangeId = 0;
         tablet.RebootTablet();