Merge to stable-23-3 (#864)

* [Blockstore] output WriteAndZeroRequestsInProgress on partition mon-page (#847)

* [Blockstore] verify that GroupRequests does not forget requests (#846)

* issue-122: AddConfirmedBlobs should do ProcessCommitQueue, otherwise compaction may get stuck (#863)

cloud/blockstore/libs/storage/core/write_buffer_request.cpp

@@ -6,8 +6,27 @@ namespace NCloud::NBlockStore::NStorage {
 
 using TRequest = TRequestInBuffer<TWriteBufferRequestData>;
 
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+
+ui32 CalculateRequestCount(
+    const TRequestGrouping& g,
+    const TVector<TRequest>& requests)
+{
+    ui32 groupedRequestCount = 0;
+    for (const auto& group: g.Groups) {
+        groupedRequestCount += group.Requests.size();
+    }
+
+    ui32 ungroupedRequestCount = requests.end() - g.FirstUngrouped;
+    return groupedRequestCount + ungroupedRequestCount;
+}
+
+}   // namespace
+
 TRequestGrouping GroupRequests(
-    TVector<TRequestInBuffer<TWriteBufferRequestData>>& requests,
+    TVector<TRequest>& requests,
     ui32 totalWeight,
     ui32 minWeight,
     ui32 maxWeight,
@@ -146,6 +165,8 @@ TRequestGrouping GroupRequests(
         }
     }
 
+    Y_DEBUG_ABORT_UNLESS(requests.size() == CalculateRequestCount(g, requests));
+
     return g;
 }
 

cloud/blockstore/libs/storage/partition/part_actor_addconfirmedblobs.cpp

@@ -340,6 +340,7 @@ void TPartitionActor::HandleAddConfirmedBlobsCompleted(
     PartCounters->RequestCounters.AddConfirmedBlobs.AddRequest(time);
 
     EnqueueAddConfirmedBlobsIfNeeded(ctx);
+    ProcessCommitQueue(ctx);
 }
 
 }   // namespace NCloud::NBlockStore::NStorage::NPartition

cloud/blockstore/libs/storage/partition/part_actor_monitoring.cpp

@@ -487,6 +487,10 @@ void TPartitionActor::HandleHttpInfo_Default(
                                 TABLED() { out << "Executor Reject Probability"; }
                                 TABLED() { out << Executor()->GetRejectProbability(); }
                             }
+                            TABLER() {
+                                TABLED() { out << "Write and zero requests in progress"; }
+                                TABLED() { out << WriteAndZeroRequestsInProgress; }
+                            }
                         }
                     }
                 }

cloud/blockstore/libs/storage/partition/part_ut.cpp

@@ -9666,6 +9666,56 @@ Y_UNIT_TEST_SUITE(TPartitionTest)
         }
     }
 
+    Y_UNIT_TEST(ShouldCompactAfterAddingConfirmedBlobs)
+    {
+        auto config = DefaultConfig();
+        config.SetAddingUnconfirmedBlobsEnabled(true);
+        auto runtime = PrepareTestActorRuntime(config);
+
+        TPartitionClient partition(*runtime);
+        partition.WaitReady();
+
+        partition.WriteBlocks(TBlockRange32::WithLength(0, 1024), 1);
+
+        TAutoPtr<IEventHandle> addConfirmedBlobs;
+        bool interceptAddConfirmedBlobs = true;
+
+        runtime->SetEventFilter(
+            [&] (TTestActorRuntimeBase&, TAutoPtr<IEventHandle>& event)
+            {
+                switch (event->GetTypeRewrite()) {
+                    case TEvPartitionPrivate::EvAddConfirmedBlobsRequest: {
+                        if (interceptAddConfirmedBlobs) {
+                            UNIT_ASSERT(!addConfirmedBlobs);
+                            addConfirmedBlobs = event.Release();
+                            return true;
+                        }
+                        break;
+                    }
+                }
+
+                return false;
+            }
+        );
+
+        partition.WriteBlocks(TBlockRange32::WithLength(0, 1024), 2);
+        UNIT_ASSERT(addConfirmedBlobs);
+
+        partition.SendCompactionRequest();
+        // wait for compaction to be queued
+        runtime->DispatchEvents(TDispatchOptions(), TDuration::Seconds(1));
+
+        interceptAddConfirmedBlobs = false;
+        runtime->Send(addConfirmedBlobs.Release());
+
+        {
+            auto compactResponse = partition.RecvCompactionResponse();
+            // should fail on S_ALREADY and S_FALSE to ensure that compaction
+            // was really taken place here
+            UNIT_ASSERT_VALUES_EQUAL(S_OK, compactResponse->GetStatus());
+        }
+    }
+
     Y_UNIT_TEST(ShouldConfirmBlobs)
     {
         auto config = DefaultConfig();