Use HttpBackgroundJob instead of Deferred Tasks during search indexing

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Handler/LuceneIndexingContentHandler.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using OrchardCore.BackgroundJobs;
 using OrchardCore.ContentLocalization;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Handlers;
@@ -50,8 +51,9 @@ private Task AddContextAsync(ContentContextBase context)
             {
                 var contexts = _contexts;
 
-                // Using a local var prevents the lambda from holding a ref on this scoped service.
-                ShellScope.AddDeferredTask(scope => IndexingAsync(scope, contexts));
+                HttpBackgroundJob.ExecuteAfterEndOfRequestAsync(
+                    nameof(LuceneIndexingContentHandler),
+                    scope => IndexingAsync(scope, contexts));
             }
 
             _contexts.Add(context);

src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Handlers/ElasticIndexingContentHandler.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using OrchardCore.BackgroundJobs;
 using OrchardCore.ContentLocalization;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Handlers;
@@ -56,7 +57,9 @@ private Task AddContextAsync(ContentContextBase context)
                 var contexts = _contexts;
 
                 // Using a local var prevents the lambda from holding a ref on this scoped service.
-                ShellScope.AddDeferredTask(scope => IndexingAsync(scope, contexts));
+                HttpBackgroundJob.ExecuteAfterEndOfRequestAsync(
+                    nameof(ElasticIndexingContentHandler),
+                    scope => IndexingAsync(scope, contexts));
             }
 
             _contexts.Add(context);

test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/ContentStepLuceneQueryTests.cs

@@ -1,7 +1,9 @@
 using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.Http;
 using OrchardCore.Autoroute.Models;
 using OrchardCore.ContentManagement;
 using OrchardCore.Tests.Apis.Context;
+using OrchardCore.Tests.Utilities;
 
 namespace OrchardCore.Tests.Apis.ContentManagement.DeploymentPlans
 {
@@ -34,21 +36,30 @@ public async Task ShouldUpdateLuceneIndexesOnImport()
 
             await context.PostRecipeAsync(recipe);
 
-            // Test
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("RecentBlogPosts", builder =>
-                {
-                    builder
-                        .WithField("displayText");
-                });
-
-            var nodes = result["data"]["recentBlogPosts"];
-
-            Assert.Equal(2, nodes.AsArray().Count);
-            Assert.Equal("new version", nodes[0]["displayText"].ToString());
-            Assert.Equal("second content item display text", nodes[1]["displayText"].ToString());
+            // Search indexes are no longer updated in a deferred task at the end of a shell scope
+            // but in a background job after the http request, so they are not already up to date.
+
+            await TimeoutTaskRunner.RunAsync(TimeSpan.FromSeconds(5), async () =>
+            {
+                // Test
+                var result = await context
+                    .GraphQLClient
+                    .Content
+                    .Query("RecentBlogPosts", builder =>
+                    {
+                        builder
+                            .WithField("displayText");
+                    });
+
+                var nodes = result["data"]["recentBlogPosts"];
+
+                return nodes is not null
+                    && nodes.AsArray().Count == 2
+                    && "new version" == nodes[0]["displayText"].ToString()
+                    && "second content item display text" == nodes[1]["displayText"].ToString();
+            }, "The Lucene index wasn't updated after the import within 5s and thus the test timed out.");
+
+
         }
     }
 }

test/OrchardCore.Tests/Apis/Context/SiteContext.cs

@@ -81,6 +81,10 @@ public virtual async Task InitializeAsync()
                 TenantName = tenantName;
             }
 
+            // Search indexes are no longer updated in a deferred task at the end of a shell scope
+            // but in a background job after the http request, so they are not already up to date.
+            await Task.Delay(2_000);
+
             if (PermissionsContext != null)
             {
                 var permissionContextKey = Guid.NewGuid().ToString();

test/OrchardCore.Tests/Apis/GraphQL/Queries/RecentBlogPostsQueryTests.cs

@@ -1,6 +1,7 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.Lists.Models;
 using OrchardCore.Tests.Apis.Context;
+using OrchardCore.Tests.Utilities;
 
 namespace OrchardCore.Tests.Apis.GraphQL
 {
@@ -26,20 +27,32 @@ public async Task ShouldListBlogPostWhenCallingAQuery()
                         });
                 });
 
-            var result = await context
-                .GraphQLClient
-                .Content
-                .Query("RecentBlogPosts", builder =>
+            // Search indexes are no longer updated in a deferred task at the end of a shell scope
+            // but in a background job after the http request, so they are not already up to date.
+            await TimeoutTaskRunner.RunAsync(TimeSpan.FromSeconds(5), async () =>
+            {
+                var result = await context
+                    .GraphQLClient
+                    .Content
+                    .Query("RecentBlogPosts", builder =>
+                    {
+                        builder
+                            .WithField("displayText");
+                    });
+                var nodes = result["data"]["recentBlogPosts"];
+                if (nodes.AsArray().Count != 2)
                 {
-                    builder
-                        .WithField("displayText");
-                });
+                    return true; // next loop
+                }
+                Assert.Equal(2, nodes.AsArray().Count);
+                Assert.Equal("Some sorta blogpost in a Query!", nodes[0]["displayText"].ToString());
+                Assert.Equal("Man must explore, and this is exploration at its greatest", nodes[1]["displayText"].ToString());
+
+                return false;
+
+            }, "The Lucene index wasn't updated after the import within 5s and thus the test timed out.");
 
-            var nodes = result["data"]["recentBlogPosts"];
 
-            Assert.Equal(2, nodes.AsArray().Count);
-            Assert.Equal("Some sorta blogpost in a Query!", nodes[0]["displayText"].ToString());
-            Assert.Equal("Man must explore, and this is exploration at its greatest", nodes[1]["displayText"].ToString());
         }
     }
 }

test/OrchardCore.Tests/Utilities/TimeoutTaskRunner.cs

@@ -0,0 +1,21 @@
+namespace OrchardCore.Tests.Utilities;
+
+public class TimeoutTaskRunner
+{
+    public static async Task RunAsync(TimeSpan timeout, Func<Task<bool>> checkNextLoop, string failMessage)
+    {
+        var timeoutTask = Task.Delay(timeout);
+        while (true)
+        {
+            if (timeoutTask.IsCompleted)
+            {
+                Assert.Fail(failMessage);
+            }
+            await Task.Delay(500);
+            if (!await checkNextLoop.Invoke())
+            {
+                break;
+            }
+        }
+    }
+}