fix(runtime): process bookmark queue per tenant scope - #8183
Open
tulrichtrimble wants to merge 1 commit into
Open
tulrichtrimble wants to merge 1 commit into
tulrichtrimble wants to merge 1 commit into
Conversation
Contributor
|
PR author is not in the allowed authors list. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
With multitenancy enabled in Elsa Core (
TenantsFeature), enqueued bookmarksremain stuck indefinitely and fail to resume workflows.
Root Cause:
BookmarkQueueWorker.ProcessAsyncexecutes on a backgroundDI scope without established tenant context. When
SetTenantIdFilterinstallsEF Core global query filters (on all Entity-derived tables when
TenantsOptions.IsEnabled = true), it comparese.TenantId == dbContext.TenantId.With null ambient tenant, the filter blocks all rows carrying real
TenantIdvalues.Result: Queue appears empty, bookmark drain silently completes with zero
items processed. Only bookmarks resumed via HTTP request scope (which resolves
tenant context) succeed.
Solution
Modified
BookmarkQueueWorker.ProcessAsyncto detect multitenancy infrastructureand iterate tenants when available:
ITenantsProviderandITenantScopeFactoryfrom root DI containerITenantsProvider.ListAsync()nullfor tenant-agnostic bookmarks)ITenantScopeFactory.CreateScope(tenant)IBookmarkQueueProcessorfrom tenant scopeThis ensures EF Core global filters match the ambient tenant context.
Impact
TriggerBookmarkQueueRecurringTaskbackstopVerification Steps
.UseTenants(f => f.UseTenantsProvider<T>())BookmarkQueueWorker.ProcessAsync()Validation
ITenantAccessor,ITenantScopeFactory, andITenantsProvider