Merge e5761bf into bba21cb

Author: serbel324

ydb/core/blobstorage/vdisk/common/vdisk_mongroups.h

@@ -899,5 +899,40 @@ public:
             COUNTER_DEF(SkeletonFrontUptimeSeconds);
         };
 
+        ///////////////////////////////////////////////////////////////////////////////////
+        // TCompactionStrategyGroup
+        ///////////////////////////////////////////////////////////////////////////////////
+        class TCompactionStrategyGroup : public TBase {
+        public:
+            GROUP_CONSTRUCTOR(TCompactionStrategyGroup)
+            {
+                COUNTER_INIT(BlobsDelSst, true);
+                COUNTER_INIT(BlobsPromoteSsts, true);
+                COUNTER_INIT(BlobsExplicit, true);
+                COUNTER_INIT(BlobsBalance, true);
+                COUNTER_INIT(BlobsFreeSpace, true);
+                COUNTER_INIT(BlobsSqueeze, true);
+
+                COUNTER_INIT(BlocksPromoteSsts, true);
+                COUNTER_INIT(BlocksBalance, true);
+
+                COUNTER_INIT(BarriersPromoteSsts, true);
+                COUNTER_INIT(BarriersBalance, true);
+            }
+
+            COUNTER_DEF(BlobsDelSst);
+            COUNTER_DEF(BlobsPromoteSsts);
+            COUNTER_DEF(BlobsExplicit);
+            COUNTER_DEF(BlobsBalance);
+            COUNTER_DEF(BlobsFreeSpace);
+            COUNTER_DEF(BlobsSqueeze);
+
+            COUNTER_DEF(BlocksPromoteSsts);
+            COUNTER_DEF(BlocksBalance);
+
+            COUNTER_DEF(BarriersPromoteSsts);
+            COUNTER_DEF(BarriersBalance);
+        };
+
     } // NMonGroup
 } // NKikimr

ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hulldefs.cpp

@@ -110,6 +110,7 @@ namespace NKikimr {
         , HullCompStorageRatioCalcPeriod(hullCompStorageRatioCalcPeriod)
         , HullCompStorageRatioMaxCalcDuration(hullCompStorageRatioMaxCalcDuration)
         , AddHeader(addHeader)
+        , CompactionStrategyGroup(VCtx->VDiskCounters, "subsystem", "compstrategy")
         , LsmHullGroup(VCtx->VDiskCounters, "subsystem", "lsmhull")
         , LsmHullSpaceGroup(VCtx->VDiskCounters, "subsystem", "outofspace")
     {}

ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hulldefs.h

@@ -140,6 +140,7 @@ namespace NKikimr {
         const TDuration HullCompStorageRatioMaxCalcDuration;
         const bool AddHeader;
 
+        NMonGroup::TCompactionStrategyGroup CompactionStrategyGroup;
         NMonGroup::TLsmHullGroup LsmHullGroup;
         NMonGroup::TLsmHullSpaceGroup LsmHullSpaceGroup;
 

ydb/core/blobstorage/vdisk/hulldb/compstrat/hulldb_compstrat_selector.cpp

@@ -36,37 +36,43 @@ namespace NKikimr {
             // delete free ssts
             action = TStrategyDelSst(HullCtx, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BlobsDelSst();
                 return action;
             }
 
             // try to promote ssts on higher levels w/o merging
             action = TStrategyPromoteSsts(HullCtx, Params.Boundaries, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BlobsPromoteSsts();
                 return action;
             }
 
             // compact explicitly defined SST's, if set
             action = TStrategyExplicit(HullCtx, Params, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BlobsExplicit();
                 return action;
             }
 
             // try to find what to compact based on levels balance
             action = TStrategyBalance(HullCtx, Params, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BlobsBalance();
                 return action;
             }
 
             // try to find what to compact base on storage consumption
             action = TStrategyFreeSpace(HullCtx, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BlobsFreeSpace();
                 return action;
             }
 
             // try to squeeze if required
             if (Params.SqueezeBefore) {
                 action = TStrategySqueeze(HullCtx, LevelSnap, Task, Params.SqueezeBefore).Select();
                 if (action != ActNothing) {
+                    ++HullCtx->CompactionStrategyGroup.BlobsSqueeze();
                     return action;
                 }
             }
@@ -89,12 +95,14 @@ namespace NKikimr {
             // try to promote ssts on higher levels w/o merging
             action = TStrategyPromoteSsts(HullCtx, Params.Boundaries, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BlocksPromoteSsts();
                 return action;
             }
 
             // try to find what to compact based on levels balance
             action = TStrategyBalance(HullCtx, Params, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BlocksBalance();
                 return action;
             }
 
@@ -117,12 +125,14 @@ namespace NKikimr {
             // try to promote ssts on higher levels w/o merging
             action = TStrategyPromoteSsts(HullCtx, Params.Boundaries, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BarriersPromoteSsts();
                 return action;
             }
 
             // try to find what to compact based on levels balance
             action = TStrategyBalance(HullCtx, Params, LevelSnap, Task).Select();
             if (action != ActNothing) {
+                ++HullCtx->CompactionStrategyGroup.BarriersBalance();
                 return action;
             }