Merge c4b96cf into 6b225ec

Author: serbel324

ydb/core/blobstorage/dsproxy/dsproxy_put.cpp

@@ -42,6 +42,7 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor {
     TErasureSplitContext ErasureSplitContext = TErasureSplitContext::Init(MaxBytesToSplitAtOnce);
     TBatchedVec<TStackVec<TRope, TypicalPartsInBlob>> PartSets;
 
+    std::set<TInstant> PutDeadlines;
     TStackVec<ui64, TypicalDisksInGroup> WaitingVDiskResponseCount;
     ui64 WaitingVDiskCount = 0;
 
@@ -647,6 +648,7 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor {
             << " RestartCounter# " << RestartCounter);
 
         for (size_t blobIdx = 0; blobIdx < PutImpl.Blobs.size(); ++blobIdx) {
+            PutDeadlines.insert(PutImpl.Blobs[blobIdx].Deadline);
             LWTRACK(DSProxyPutBootstrapStart, PutImpl.Blobs[blobIdx].Orbit);
         }
 
@@ -667,7 +669,8 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor {
             getTotalSize()
         );
 
-        Become(&TBlobStorageGroupPutRequest::StateWait, TDuration::MilliSeconds(DsPutWakeupMs), new TKikimrEvents::TEvWakeup);
+        Become(&TBlobStorageGroupPutRequest::StateWait);
+        ScheduleWakeup();
 
         PartSets.resize(PutImpl.Blobs.size());
         for (auto& partSet : PartSets) {
@@ -721,12 +724,12 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor {
         const TInstant now = TActivationContext::Now();
         TPutImpl::TPutResultVec putResults;
         for (size_t blobIdx = 0; blobIdx < PutImpl.Blobs.size(); ++blobIdx) {
-            if (!PutImpl.Blobs[blobIdx].Replied && now > PutImpl.Blobs[blobIdx].Deadline) {
+            if (!PutImpl.Blobs[blobIdx].Replied && now >= PutImpl.Blobs[blobIdx].Deadline) {
                 PutImpl.PrepareOneReply(NKikimrProto::DEADLINE, blobIdx, LogCtx, "Deadline timer hit", putResults);
             }
         }
         ReplyAndDieWithLastResponse(putResults);
-        Schedule(TDuration::MilliSeconds(DsPutWakeupMs), new TKikimrEvents::TEvWakeup);
+        ScheduleWakeup();
     }
 
     void UpdatePengingVDiskResponseCount(const TDeque<TPutImpl::TPutEvent>& putEvents) {
@@ -793,6 +796,19 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor {
             << " State# " << PutImpl.DumpFullState());
     }
 
+    void ScheduleWakeup() {
+        TInstant now = TActivationContext::Now();
+        while (!PutDeadlines.empty()) {
+            TInstant deadline = *PutDeadlines.begin();
+            PutDeadlines.erase(PutDeadlines.begin());
+            if (deadline > now) {
+                Schedule(deadline, new TKikimrEvents::TEvWakeup);
+                return;
+            }
+        }
+        Schedule(TDuration::MilliSeconds(DsPutWakeupMs), new TKikimrEvents::TEvWakeup);
+    }
+
     STATEFN(StateWait) {
         if (ProcessEvent(ev, true)) {
             return;

ydb/core/blobstorage/dsproxy/dsproxy_request.cpp

@@ -425,7 +425,7 @@ namespace NKikimr {
                     .ExecutionRelay = ev->Get()->ExecutionRelay
                 }
             }),
-            TInstant::Max()
+            ev->Get()->Deadline
         );
     }