Merge branch 'release/4.x-hotfix' of https://github.com/Azure/azure-functions-host into release/4.x-hotfix

# Conflicts:
#	build/common.props
#	release_notes.md
#	src/WebJobs.Script.WebHost/PreJIT/coldstart.jittrace
#	src/WebJobs.Script.WebHost/PreJIT/linux.coldstart.jittrace

Author: safihamid

build/common.props

@@ -4,8 +4,8 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
     <MajorVersion>4</MajorVersion>
-    <MinorVersion>10</MinorVersion>
-    <PatchVersion>3</PatchVersion>
+    <MinorVersion>11</MinorVersion>
+    <PatchVersion>0</PatchVersion>
     <BuildNumber Condition="'$(BuildNumber)' == '' ">0</BuildNumber>
     <PreviewVersion></PreviewVersion>        
 

release_notes.md

@@ -9,4 +9,4 @@
 - Updated Java Worker Version to [2.4.0](https://github.com/Azure/azure-functions-java-worker/releases/tag/2.4.0)
 
 **Release sprint:** Sprint 128
-[ [bugs](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+128%22+label%3Abug+is%3Aclosed) | [features](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+128%22+label%3Afeature+is%3Aclosed) ]
+[ [bugs](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+128%22+label%3Abug+is%3Aclosed) | [features](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+128%22+label%3Afeature+is%3Aclosed) ]

src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs

@@ -73,6 +73,7 @@ internal class GrpcWorkerChannel : IRpcWorkerChannel, IDisposable
         private TaskCompletionSource<List<RawFunctionMetadata>> _functionsIndexingTask = new TaskCompletionSource<List<RawFunctionMetadata>>(TaskCreationOptions.RunContinuationsAsynchronously);
         private TimeSpan _functionLoadTimeout = TimeSpan.FromMinutes(1);
         private bool _isSharedMemoryDataTransferEnabled;
+        private bool _cancelCapabilityEnabled;
 
         private object _syncLock = new object();
         private System.Timers.Timer _timer;
@@ -275,6 +276,7 @@ internal void WorkerInitResponse(GrpcEvent initEvent)
             _state = _state | RpcWorkerChannelState.Initialized;
             _workerCapabilities.UpdateCapabilities(_initMessage.Capabilities);
             _isSharedMemoryDataTransferEnabled = IsSharedMemoryDataTransferEnabled();
+            _cancelCapabilityEnabled = !string.IsNullOrEmpty(_workerCapabilities.GetCapabilityState(RpcWorkerConstants.HandlesInvocationCancelMessage));
 
             if (!_isSharedMemoryDataTransferEnabled)
             {
@@ -501,36 +503,58 @@ internal async Task SendInvocationRequest(ScriptInvocationContext context)
                     _workerChannelLogger.LogDebug($"Function {context.FunctionMetadata.Name} failed to load");
                     context.ResultSource.TrySetException(_functionLoadErrors[context.FunctionMetadata.GetFunctionId()]);
                     _executingInvocations.TryRemove(context.ExecutionContext.InvocationId.ToString(), out ScriptInvocationContext _);
+                    return;
                 }
                 else if (_metadataRequestErrors.ContainsKey(context.FunctionMetadata.GetFunctionId()))
                 {
                     _workerChannelLogger.LogDebug($"Worker failed to load metadata for {context.FunctionMetadata.Name}");
                     context.ResultSource.TrySetException(_metadataRequestErrors[context.FunctionMetadata.GetFunctionId()]);
                     _executingInvocations.TryRemove(context.ExecutionContext.InvocationId.ToString(), out ScriptInvocationContext _);
+                    return;
                 }
-                else
+
+                if (context.CancellationToken.IsCancellationRequested)
                 {
-                    if (context.CancellationToken.IsCancellationRequested)
-                    {
-                        context.ResultSource.SetCanceled();
-                        return;
-                    }
-                    var invocationRequest = await context.ToRpcInvocationRequest(_workerChannelLogger, _workerCapabilities, _isSharedMemoryDataTransferEnabled, _sharedMemoryManager);
-                    AddAdditionalTraceContext(invocationRequest.TraceContext.Attributes, context);
-                    _executingInvocations.TryAdd(invocationRequest.InvocationId, context);
+                    _workerChannelLogger.LogDebug("Cancellation has been requested, cancelling invocation request");
+                    context.ResultSource.SetCanceled();
+                    return;
+                }
 
-                    SendStreamingMessage(new StreamingMessage
-                    {
-                        InvocationRequest = invocationRequest
-                    });
+                var invocationRequest = await context.ToRpcInvocationRequest(_workerChannelLogger, _workerCapabilities, _isSharedMemoryDataTransferEnabled, _sharedMemoryManager);
+                AddAdditionalTraceContext(invocationRequest.TraceContext.Attributes, context);
+                _executingInvocations.TryAdd(invocationRequest.InvocationId, context);
+
+                if (_cancelCapabilityEnabled)
+                {
+                    context.CancellationToken.Register(() => SendInvocationCancel(invocationRequest.InvocationId));
                 }
+
+                SendStreamingMessage(new StreamingMessage
+                {
+                    InvocationRequest = invocationRequest
+                });
             }
             catch (Exception invokeEx)
             {
                 context.ResultSource.TrySetException(invokeEx);
             }
         }
 
+        internal void SendInvocationCancel(string invocationId)
+        {
+            _workerChannelLogger.LogDebug($"Sending invocation cancel request for InvocationId {invocationId}");
+
+            var invocationCancel = new InvocationCancel
+            {
+                InvocationId = invocationId
+            };
+
+            SendStreamingMessage(new StreamingMessage
+            {
+                InvocationCancel = invocationCancel
+            });
+        }
+
         // gets metadata from worker
         public Task<List<RawFunctionMetadata>> GetFunctionMetadata()
         {

src/WebJobs.Script.Grpc/MessageExtensions/StatusResultExtensions.cs

@@ -30,22 +30,19 @@ public static bool IsFailure(this StatusResult statusResult, out Exception excep
         }
 
         /// <summary>
-        /// This method is only hit on the invocation code path. enableUserCodeExceptionCapability = feature flag,
-        /// exposed as a capability that is set by the worker.
+        /// This method is only hit on the invocation code path.
+        /// enableUserCodeExceptionCapability = feature flag exposed as a capability that is set by the worker.
         /// </summary>
         public static bool IsInvocationSuccess<T>(this StatusResult status, TaskCompletionSource<T> tcs, bool enableUserCodeExceptionCapability = false)
         {
             switch (status.Status)
             {
                 case StatusResult.Types.Status.Failure:
+                case StatusResult.Types.Status.Cancelled:
                     var rpcException = GetRpcException(status, enableUserCodeExceptionCapability);
                     tcs.SetException(rpcException);
                     return false;
 
-                case StatusResult.Types.Status.Cancelled:
-                    tcs.SetCanceled();
-                    return false;
-
                 default:
                     return true;
             }
@@ -65,6 +62,7 @@ public static Workers.Rpc.RpcException GetRpcException(StatusResult statusResult
                 {
                     return new Workers.Rpc.RpcException(status, ex.Message, ex.StackTrace, ex.Type, ex.IsUserException);
                 }
+
                 return new Workers.Rpc.RpcException(status, ex.Message, ex.StackTrace);
             }
             return new Workers.Rpc.RpcException(status, string.Empty, string.Empty);

src/WebJobs.Script.WebHost/Configuration/CorsOptionsSetup.cs

@@ -23,7 +23,7 @@ public CorsOptionsSetup(IEnvironment env, IOptions<HostCorsOptions> hostCorsOpti
 
         public void Configure(CorsOptions options)
         {
-            if (_env.IsLinuxConsumption())
+            if (_env.IsAnyLinuxConsumption())
             {
                 string[] allowedOrigins = _hostCorsOptions.Value.AllowedOrigins?.ToArray() ?? Array.Empty<string>();
                 var policyBuilder = new CorsPolicyBuilder(allowedOrigins);

src/WebJobs.Script.WebHost/Configuration/ScriptApplicationHostOptionsSetup.cs

@@ -76,7 +76,7 @@ private bool IsZipDeployment(out bool isScmRunFromPackage)
                 Utility.IsValidZipSetting(_environment.GetEnvironmentVariable(AzureWebsiteAltZipDeployment)) ||
                 Utility.IsValidZipSetting(_environment.GetEnvironmentVariable(AzureWebsiteRunFromPackage));
 
-            if (!_environment.IsLinuxConsumption())
+            if (!_environment.IsAnyLinuxConsumption())
             {
                 isScmRunFromPackage = false;
                 // This check is strong enough for SKUs other than Linux Consumption.

src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerActivityPublisher.cs

@@ -38,7 +38,7 @@ public LinuxContainerActivityPublisher(IOptionsMonitor<StandbyOptions> standbyOp
             IMeshServiceClient meshServiceClient, IEnvironment environment,
             ILogger<LinuxContainerActivityPublisher> logger, int flushIntervalMs = FlushIntervalMs, int initialFlushIntervalMs = InitialFlushIntervalMs)
         {
-            if (!environment.IsLinuxConsumption())
+            if (!environment.IsAnyLinuxConsumption())
             {
                 throw new NotSupportedException(
                     $"{nameof(LinuxContainerActivityPublisher)} is available in Linux consumption environment only");

src/WebJobs.Script.WebHost/ContainerManagement/LinuxContainerInitializationHostService.cs

@@ -37,10 +37,14 @@ public async Task StartAsync(CancellationToken cancellationToken)
             _cancellationToken = cancellationToken;
 
             // The service should be registered in Linux Consumption only, but do additional check here.
-            if (_environment.IsLinuxConsumption())
+            if (_environment.IsLinuxConsumptionOnAtlas())
             {
                 await ApplyStartContextIfPresent();
             }
+            else if (_environment.IsLinuxConsumptionOnLegion())
+            {
+                _logger.LogInformation("Container has (re)started. Waiting for specialization");
+            }
         }
 
         private async Task ApplyStartContextIfPresent()

src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs

@@ -214,7 +214,7 @@ internal static bool IsSyncTriggersEnvironment(IScriptWebHostEnvironment webHost
 
             // Windows (Dedicated/Consumption)
             // Linux Consumption
-            if ((environment.IsWindowsAzureManagedHosting() || environment.IsLinuxConsumption()) &&
+            if ((environment.IsWindowsAzureManagedHosting() || environment.IsAnyLinuxConsumption()) &&
                 !environment.IsContainerReady())
             {
                 // container ready flag not set yet – site not fully specialized/initialized

src/WebJobs.Script.WebHost/Middleware/HostWarmupMiddleware.cs

@@ -56,7 +56,7 @@ public async Task WarmupInvoke(HttpContext httpContext)
             if (!_jitTraceHasRun)
             {
                 PreJitPrepare(WarmUpConstants.JitTraceFileName);
-                if (_environment.IsLinuxConsumption())
+                if (_environment.IsAnyLinuxConsumption())
                 {
                     PreJitPrepare(WarmUpConstants.LinuxJitTraceFileName);
                 }
@@ -147,7 +147,7 @@ public async Task WarmUp(HttpRequest request)
         public static bool IsWarmUpRequest(HttpRequest request, bool inStandbyMode, IEnvironment environment)
         {
             return inStandbyMode
-                && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) || environment.IsLinuxConsumption())
+                && ((environment.IsAppService() && request.IsAppServiceInternalRequest(environment)) || environment.IsAnyLinuxConsumption())
                 && (request.Path.StartsWithSegments(_warmupRoutePath) || request.Path.StartsWithSegments(_warmupRouteAlternatePath));
         }
     }