Ensuring JobHost restart suppresion aligns with request lifecycle

Azure · Nov 17, 2024 · d830150 · d830150
1 parent 6f7b2d5
commit d830150
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs b/src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs
@@ -12,6 +12,7 @@
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.WebJobs.Extensions.Http;
+using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Management.Models;
 using Microsoft.Azure.WebJobs.Script.WebHost.Extensions;
@@ -80,12 +81,10 @@ public async Task<IActionResult> CreateOrUpdate(string name, [FromBody] Function
                 return BadRequest($"{name} is not a valid function name");
             }
 
-            bool success, configChanged;
-            FunctionMetadataResponse functionMetadataResponse;
-            using (fileMonitoringService.SuspendRestart(true))
-            {
-                (success, configChanged, functionMetadataResponse) = await _functionsManager.CreateOrUpdate(name, functionMetadata, Request);
-            }
+            var restartSuspensionScope = fileMonitoringService.SuspendRestart(true);
+            Response.RegisterForDispose(restartSuspensionScope);
+
+            (bool success, _, FunctionMetadataResponse functionMetadataResponse) = await _functionsManager.CreateOrUpdate(name, functionMetadata, Request);
 
             if (success)
             {
@@ -200,12 +199,10 @@ public async Task<IActionResult> Delete(string name, [FromServices] IFileMonitor
                 return NotFound();
             }
 
-            bool deleted;
-            string error;
-            using (fileMonitoringService.SuspendRestart(true))
-            {
-                (deleted, error) = await _functionsManager.TryDeleteFunction(function);
-            }
+            var restartSuspensionScope = fileMonitoringService.SuspendRestart(true);
+            Response.RegisterForDispose(restartSuspensionScope);
+
+            (bool deleted, string error) = await _functionsManager.TryDeleteFunction(function);
 
             if (deleted)
             {