Fix ICB MaxChunksToDefragInflight (#21322) (#21483)

Co-authored-by: Vlad Kuznetsov <[email protected]>

Author: robdrynkin

ydb/core/blobstorage/nodewarden/node_warden_impl.h

@@ -186,7 +186,7 @@ namespace NKikimr::NStorage {
             , MaxSyncLogChunksInFlightSSD(10, 1, 1024)
             , DefaultHugeGarbagePerMille(300, 1, 1000)
             , HugeDefragFreeSpaceBorderPerMille(260, 1, 1000)
-            , MaxChunksToDefragInflight(10, 1, 50)
+            , MaxChunksToDefragInflight(10, 1, 1000)
             , EnableExplicitCompactionAfterDefrag(1, 0, 1)
             , FreshCompMaxInFlightWrites(10, 1, 1000)
             , HullCompMaxInFlightWrites(10, 1, 1000)

ydb/core/blobstorage/vdisk/defrag/defrag_actor.cpp

@@ -30,7 +30,6 @@ namespace NKikimr {
         , HugeKeeperId(hugeKeeperId)
         , DefragMonGroup(VCtx->VDiskCounters, "subsystem", "defrag")
         , RunDefragBySchedule(runDefrageBySchedule)
-        , MaxChunksToDefrag(vconfig->MaxChunksToDefragInflight)
     {}
 
     TDefragCtx::~TDefragCtx() = default;
@@ -138,8 +137,8 @@ namespace NKikimr {
                     double hugeDefragFreeSpaceBorder = DCtx->VCfg->HugeDefragFreeSpaceBorderPerMille / 1000.0;
                     DCtx->DefragMonGroup.DefragThreshold() = DefragThreshold(oos, defaultPercent, hugeDefragFreeSpaceBorder);
                     if (HugeHeapDefragmentationRequired(oos, canBeFreedChunks, totalChunks, defaultPercent, hugeDefragFreeSpaceBorder)) {
-                        TChunksToDefrag chunksToDefrag = calcStat.GetChunksToDefrag(MaxInflyghtDefragChunks(DCtx->MaxChunksToDefrag, canBeFreedChunks));
-                        Y_ABORT_UNLESS(chunksToDefrag);
+                        TChunksToDefrag chunksToDefrag = calcStat.GetChunksToDefrag(MaxInflyghtDefragChunks(DCtx->VCfg->MaxChunksToDefragInflight, canBeFreedChunks));
+                        Y_VERIFY_S(chunksToDefrag, DCtx->VCtx->VDiskLogPrefix);
                         STLOG(PRI_INFO, BS_VDISK_DEFRAG, BSVDD03, VDISKP(DCtx->VCtx->VDiskLogPrefix, "scan finished"),
                             (TotalChunks, totalChunks), (UsefulChunks, usefulChunks),
                             (LocalColor, NKikimrBlobStorage::TPDiskSpaceColor_E_Name(oos.GetLocalColor())),
@@ -264,12 +263,21 @@ namespace NKikimr {
                 Sublog.Log() << "=== Starting Defrag ===\n";
             }
 
-            Sublog.Log() << "Defrag quantum started\n";
+            auto chunksToDefrag = std::visit([](auto& r) { return GetChunksToDefrag(r); }, task.Request);
+            if (!chunksToDefrag) {
+                Sublog.Log() << "Defrag quantum started {nothing} \n";
+            } else {
+                Sublog.Log() << "Defrag quantum started"
+                            << " {chunksSize# " << chunksToDefrag->Chunks.size()
+                            << " foundChunks# " << chunksToDefrag->FoundChunksToDefrag
+                            << " estimatedSlots# " << chunksToDefrag->EstimatedSlotsCount
+                            << " }\n";
+            }
             ++TotalDefragRuns;
             InProgress = true;
             ActiveActors.Insert(ctx.Register(CreateDefragQuantumActor(DCtx,
                 GInfo->GetVDiskId(DCtx->VCtx->ShortSelfVDisk),
-                std::visit([](auto& r) { return GetChunksToDefrag(r); }, task.Request), DCtx->VCfg->EnableExplicitCompactionAfterDefrag)), __FILE__, __LINE__,
+                chunksToDefrag, DCtx->VCfg->EnableExplicitCompactionAfterDefrag)), __FILE__, __LINE__,
                 ctx, NKikimrServices::BLOBSTORAGE);
         }
 

ydb/core/blobstorage/vdisk/defrag/defrag_actor.h

@@ -26,9 +26,6 @@ namespace NKikimr {
         NMonGroup::TDefragGroup DefragMonGroup;
         bool RunDefragBySchedule;
 
-        // free up to this number of chunks in one quantum
-        ui32 MaxChunksToDefrag = 1u;
-
         TDefragCtx(
                 const TIntrusivePtr<TVDiskContext> &vctx,
                 const TIntrusivePtr<TVDiskConfig> &vconfig,

ydb/core/blobstorage/vdisk/defrag/defrag_quantum.cpp

@@ -56,6 +56,7 @@ namespace NKikimr {
 
         void RunImpl() {
             TEvDefragQuantumResult::TStat stat{.Eof = true};
+            ui32 maxChunksToDefrag = DCtx->VCfg->MaxChunksToDefragInflight;
 
             if (ChunksToDefrag) {
                 Y_ABORT_UNLESS(*ChunksToDefrag);
@@ -68,12 +69,12 @@ namespace NKikimr {
                     }
                     Yield();
                 }
-                ChunksToDefrag.emplace(findChunks.GetChunksToDefrag(DCtx->MaxChunksToDefrag));
+                ChunksToDefrag.emplace(findChunks.GetChunksToDefrag(maxChunksToDefrag));
             }
             if (*ChunksToDefrag) {
                 stat.FoundChunksToDefrag = ChunksToDefrag->FoundChunksToDefrag;
                 stat.FreedChunks = ChunksToDefrag->Chunks;
-                stat.Eof = stat.FoundChunksToDefrag < DCtx->MaxChunksToDefrag;
+                stat.Eof = stat.FoundChunksToDefrag < maxChunksToDefrag;
 
                 auto lockedChunks = LockChunks(*ChunksToDefrag);