Fix batch message deduplication logic to not update batch on already batched message - 5.11 (#4795)

jpalac · web-flow · commit a06f0aaefa5b · 2025-02-12T14:29:37.000+10:00
diff --git a/src/ServiceControl.Persistence.RavenDB/RetryDocumentDataStore.cs b/src/ServiceControl.Persistence.RavenDB/RetryDocumentDataStore.cs
@@ -113,7 +113,7 @@ static ICommandData CreateFailedMessageRetryDocument(string batchDocumentId, str
                 }
             };
 
-            return new PatchCommandData(FailedMessageRetry.MakeDocumentId(messageId), null, patch: patchRequest, patchIfMissing: patchRequest);
+            return new PatchCommandData(FailedMessageRetry.MakeDocumentId(messageId), null, patch: new PatchRequest { Script = "" }, patchIfMissing: patchRequest);
         }
 
         public async Task GetBatchesForAll(DateTime cutoff, Func<string, DateTime, Task> callback)

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ static ICommandData CreateFailedMessageRetryDocument(string batchDocumentId, str`
`113`	`113`	`}`
`114`	`114`	`};`
`115`	`115`
`116`		`- return new PatchCommandData(FailedMessageRetry.MakeDocumentId(messageId), null, patch: patchRequest, patchIfMissing: patchRequest);`
	`116`	`+ return new PatchCommandData(FailedMessageRetry.MakeDocumentId(messageId), null, patch: new PatchRequest { Script = "" }, patchIfMissing: patchRequest);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public async Task GetBatchesForAll(DateTime cutoff, Func<string, DateTime, Task> callback)`