Skip to content

Removes RetryHistory.Id #5698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnsimons merged 1 commit into from
Aug 5, 2026
+5 −7
Merged

Removes RetryHistory.Id #5698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/ServiceControl.Persistence.RavenDB/Recoverability/RetryHistoryDataStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ class RetryHistoryDataStore(IRavenSessionProvider sessionProvider) : IRetryHisto
public async Task<RetryHistory> GetRetryHistory()
{
using var session = await sessionProvider.OpenSession();
var id = DocumentId;
var retryHistory = await session.LoadAsync<RetryHistory>(id);
var retryHistory = await session.LoadAsync<RetryHistory>(DocumentId);

retryHistory ??= new() { Id = DocumentId };
retryHistory ??= new();

return retryHistory;
}
Expand All @@ -23,7 +22,7 @@ public async Task RecordRetryOperationCompleted(string requestId, RetryType retr
string originator, string classifier, bool messageFailed, int numberOfMessagesProcessed, DateTime lastProcessed, int retryHistoryDepth)
{
using var session = await sessionProvider.OpenSession();
var retryHistory = await session.LoadAsync<RetryHistory>(DocumentId) ?? new() { Id = DocumentId };
var retryHistory = await session.LoadAsync<RetryHistory>(DocumentId) ?? new();

retryHistory.AddToUnacknowledged(new UnacknowledgedRetryOperation
{
Expand All @@ -49,7 +48,7 @@ public async Task RecordRetryOperationCompleted(string requestId, RetryType retr
NumberOfMessagesProcessed = numberOfMessagesProcessed
}, retryHistoryDepth);

await session.StoreAsync(retryHistory);
await session.StoreAsync(retryHistory, DocumentId);
await session.SaveChangesAsync();
}

Expand All @@ -61,7 +60,7 @@ public async Task<bool> AcknowledgeRetryGroup(string groupId)
{
if (retryHistory.Acknowledge(groupId, RetryType.FailureGroup))
{
await session.StoreAsync(retryHistory);
await session.StoreAsync(retryHistory, DocumentId);
await session.SaveChangesAsync();

return true;
Expand Down
1 change: 0 additions & 1 deletion src/ServiceControl.Persistence/RetryHistory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

public class RetryHistory
{
public string Id { get; set; }
public List<HistoricRetryOperation> HistoricOperations { get; set; } = [];
public List<UnacknowledgedRetryOperation> UnacknowledgedOperations { get; set; } = [];

Expand Down
Loading