Developer/hamids/v4.10.2 hotfix (#8699)

safihamid · web-flow · commit 1d97ee08e27a · 2022-09-01T14:26:45.000-05:00
* Disable NoGCRegion on Linux consumption. (#8687) * Update to 4.10.3 * Update to IsLinuxConsumption check as IsAnyLinuxConsumption was added later on.
diff --git a/build/common.props b/build/common.props
@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <MajorVersion>4</MajorVersion>
     <MinorVersion>10</MinorVersion>
-    <PatchVersion>2</PatchVersion>
+    <PatchVersion>3</PatchVersion>
     <BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
     <PreviewVersion></PreviewVersion>        
     
diff --git a/src/WebJobs.Script.WebHost/Middleware/ClrOptimizationMiddleware.cs b/src/WebJobs.Script.WebHost/Middleware/ClrOptimizationMiddleware.cs
@@ -31,7 +31,7 @@ public ClrOptimizationMiddleware(RequestDelegate next, IScriptWebHostEnvironment
             _environment = environment;
             _logger = logger;
             _next = next;
-            _invoke = InvokeClrOptimizationCheck;
+            _invoke = _environment.IsLinuxConsumption() ? next : InvokeClrOptimizationCheck;
         }
 
         public Task Invoke(HttpContext context)
@@ -56,7 +56,7 @@ private void StartStopGCAsBestEffort()
             try
             {
                 // optimization not intended for single core VMs
-                if (_webHostEnvironment.InStandbyMode && _environment.GetEffectiveCoresCount() > 1)
+                if (_webHostEnvironment.InStandbyMode && _environment.GetEffectiveCoresCount() > 1 && !_environment.IsLinuxConsumption())
                 {
                     // If in placeholder mode and already in NoGCRegion, let's end it then start NoGCRegion again.
                     // This may happen if there are multiple warmup calls(few minutes apart) during placeholder mode and before specialization.

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public ClrOptimizationMiddleware(RequestDelegate next, IScriptWebHostEnvironment`
`31`	`31`	`_environment = environment;`
`32`	`32`	`_logger = logger;`
`33`	`33`	`_next = next;`
`34`		`- _invoke = InvokeClrOptimizationCheck;`
	`34`	`+ _invoke = _environment.IsLinuxConsumption() ? next : InvokeClrOptimizationCheck;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public Task Invoke(HttpContext context)`
`@@ -56,7 +56,7 @@ private void StartStopGCAsBestEffort()`
`56`	`56`	`try`
`57`	`57`	`{`
`58`	`58`	`// optimization not intended for single core VMs`
`59`		`- if (_webHostEnvironment.InStandbyMode && _environment.GetEffectiveCoresCount() > 1)`
	`59`	`+ if (_webHostEnvironment.InStandbyMode && _environment.GetEffectiveCoresCount() > 1 && !_environment.IsLinuxConsumption())`
`60`	`60`	`{`
`61`	`61`	`// If in placeholder mode and already in NoGCRegion, let's end it then start NoGCRegion again.`
`62`	`62`	`// This may happen if there are multiple warmup calls(few minutes apart) during placeholder mode and before specialization.`