env var

Author: BrennanConroy

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.cpp

@@ -13,6 +13,7 @@
 #define CS_ASPNETCORE_CLEAN_SHADOW_DIRECTORY_CONTENT     L"cleanShadowCopyDirectory"
 #define CS_ASPNETCORE_DISALLOW_ROTATE_CONFIG             L"disallowRotationOnConfigChange"
 #define CS_ASPNETCORE_SHUTDOWN_DELAY                     L"shutdownDelay"
+#define CS_ASPNEtCORE_SHUTDOWN_DELAY_ENV                 L"ANCM_shutdownDelay"
 
 ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) :
         m_hostingModel(HOSTING_UNKNOWN),
@@ -55,17 +56,6 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) :
     auto disallowRotationOnConfigChange = find_element(handlerSettings, CS_ASPNETCORE_DISALLOW_ROTATE_CONFIG).value_or(std::wstring());
     m_fDisallowRotationOnConfigChange = equals_ignore_case(L"true", disallowRotationOnConfigChange);
 
-    auto shutdownDelay = find_element(handlerSettings, CS_ASPNETCORE_SHUTDOWN_DELAY).value_or(std::wstring());
-    if (shutdownDelay.empty())
-    {
-        m_fShutdownDelay = std::chrono::seconds(1);
-    }
-    else
-    {
-        auto str = to_multi_byte_string(shutdownDelay, CP_UTF8);
-        m_fShutdownDelay = std::chrono::milliseconds(std::atoi(str.c_str()));
-    }
-                
     m_strProcessPath = section->GetRequiredString(CS_ASPNETCORE_PROCESS_EXE_PATH);
     m_strArguments = section->GetString(CS_ASPNETCORE_PROCESS_ARGUMENTS).value_or(CS_ASPNETCORE_PROCESS_ARGUMENTS_DEFAULT);
     m_fStdoutLogEnabled = section->GetRequiredBool(CS_ASPNETCORE_STDOUT_LOG_ENABLED);
@@ -94,4 +84,33 @@ ShimOptions::ShimOptions(const ConfigurationSource &configurationSource) :
     auto dotnetEnvironmentEnabled = equals_ignore_case(L"Development", dotnetEnvironment);
 
     m_fShowDetailedErrors = detailedErrorsEnabled || aspnetCoreEnvironmentEnabled || dotnetEnvironmentEnabled;
+
+    // Specifies how long to delay (in milliseconds) after IIS tells us to stop before starting the application shutdown.
+    // See StartShutdown in globalmodule to see how it's used.
+    auto shutdownDelay = find_element(handlerSettings, CS_ASPNETCORE_SHUTDOWN_DELAY).value_or(std::wstring());
+    if (shutdownDelay.empty())
+    {
+        // Fallback to environment variable if process specific config wasn't set
+        shutdownDelay = Environment::GetEnvironmentVariableValue(CS_ASPNEtCORE_SHUTDOWN_DELAY_ENV)
+            .value_or(environmentVariables[CS_ASPNEtCORE_SHUTDOWN_DELAY_ENV]);
+        if (shutdownDelay.empty())
+        {
+            // Default if neither process specific config or environment variable aren't set
+            m_fShutdownDelay = std::chrono::seconds(1);
+        }
+        else
+        {
+            SetShutdownDelay(shutdownDelay);
+        }
+    }
+    else
+    {
+        SetShutdownDelay(shutdownDelay);
+    }
+}
+
+void ShimOptions::SetShutdownDelay(std::wstring& shutdownDelay)
+{
+    auto str = to_multi_byte_string(shutdownDelay, CP_UTF8);
+    m_fShutdownDelay = std::chrono::milliseconds(std::atoi(str.c_str()));
 }

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ShimOptions.h

@@ -111,4 +111,6 @@ class ShimOptions: NonCopyable
     bool                           m_fDisallowRotationOnConfigChange;
     std::wstring                   m_strShadowCopyingDirectory;
     std::chrono::milliseconds      m_fShutdownDelay;
+
+    void SetShutdownDelay(std::wstring& shutdownDelay);
 };

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/dllmain.cpp

@@ -126,24 +126,13 @@ HRESULT
                                   RQ_EXECUTE_REQUEST_HANDLER,
                                   0));
 
-    //auto delay = applicationManager->GetShutdownDelay();
     auto pGlobalModule = std::make_unique<ASPNET_CORE_GLOBAL_MODULE>(std::move(applicationManager));
 
-    //if (delay == std::chrono::milliseconds::zero())
-    //{
-    //    RETURN_IF_FAILED(pModuleInfo->SetGlobalNotifications(
-    //        pGlobalModule.release(),
-    //        GL_CONFIGURATION_CHANGE | // Configuration change triggers IIS application stop
-    //        GL_STOP_LISTENING)); // worker process stop
-    //}
-    //else
-    {
-        RETURN_IF_FAILED(pModuleInfo->SetGlobalNotifications(
-            pGlobalModule.release(),
-            GL_CONFIGURATION_CHANGE | // Configuration change triggers IIS application stop
-            GL_STOP_LISTENING | // worker process stop
-            GL_APPLICATION_STOP)); // app pool recycle
-    }
+    RETURN_IF_FAILED(pModuleInfo->SetGlobalNotifications(
+        pGlobalModule.release(),
+        GL_CONFIGURATION_CHANGE | // Configuration change triggers IIS application stop
+        GL_STOP_LISTENING | // worker process will stop listening for http requests
+        GL_APPLICATION_STOP)); // app pool recycle or stop
 
     return S_OK;
 }

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp

@@ -40,12 +40,15 @@ ASPNET_CORE_GLOBAL_MODULE::OnGlobalApplicationStop(
     IN IHttpApplicationStopProvider* pProvider
 )
 {
+    UNREFERENCED_PARAMETER(pProvider);
+
+    // If we're already cleaned up just return.
+    // If user has opted out of the new shutdown behavior ignore this call as we never registered for it before
     if (!m_pApplicationManager || m_pApplicationManager->GetShutdownDelay() == std::chrono::milliseconds::zero())
     {
         return GL_NOTIFICATION_CONTINUE;
     }
 
-    UNREFERENCED_PARAMETER(pProvider);
     LOG_INFO(L"ASPNET_CORE_GLOBAL_MODULE::OnGlobalApplicationStop");
 
     if (!g_fInShutdown && !m_shutdown.joinable())

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.h

@@ -68,15 +68,17 @@ class ASPNET_CORE_GLOBAL_MODULE : NonCopyable, public CGlobalModule
         else
         {
             // Run shutdown on a background thread. It seems like IIS keeps giving us requests if OnGlobalStopListening is still running
-            // which will result in 503s since we're shutting down.
-            // But if we return ASAP from OnGlobalStopListening (by not shutting down inline),
+            // which will result in 503s from applicationmanager since we're shutting down and don't want to process new requests.
+            // But if we return ASAP from OnGlobalStopListening, by not shutting down inline and with a small delay to reduce races,
             // IIS will actually stop giving us new requests and queue them instead for processing by the new app process.
             m_shutdown = std::thread([this]()
                 {
                     auto delay = m_pApplicationManager->GetShutdownDelay();
                     LOG_INFOF(L"Shutdown starting in %d ms.", delay.count());
                     // Delay so that any incoming requests while we're returning from OnGlobalStopListening are allowed to be processed
                     std::this_thread::sleep_for(delay);
+
+                    LOG_INFO(L"Shutdown starting.");
                     m_pApplicationManager->ShutDown();
                     m_pApplicationManager = nullptr;
                 });

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/proxymodule.cpp

@@ -93,7 +93,7 @@ ASPNET_CORE_PROXY_MODULE::OnExecuteRequestHandler(
     {
         if (g_fInShutdown)
         {
-            LOG_INFO(L"Received request during shutdown. Will return 503.");
+            LOG_INFO(L"Received a request during shutdown. Will return a 503 response.");
             FINISHED(HRESULT_FROM_WIN32(ERROR_SERVER_SHUTDOWN_IN_PROGRESS));
         }
 

src/Servers/IIS/IIS/test/Common.LongTests/ShutdownTests.cs

@@ -262,7 +262,6 @@ await statusConnection.Receive("5",
 
     [ConditionalFact]
     [RequiresNewShim]
-    [Repeat(10)] // temp for CI testing
     public async Task RequestsWhileRestartingAppFromConfigChangeAreProcessed()
     {
         var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite);
@@ -300,7 +299,6 @@ public async Task RequestsWhileRestartingAppFromConfigChangeAreProcessed()
 
     [ConditionalFact]
     [RequiresNewShim]
-    [Repeat(10)] // temp for CI testing
     public async Task RequestsWhileRecyclingAppAreProcessed()
     {
         var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite);