Revert "Removing copy on shutdown"

jkotalik · jkotalik · commit 9717ec3edcf7 · 2021-02-01T09:08:37.000-08:00
This reverts commit b4ea78a.
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
@@ -93,6 +93,7 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
             errorContext.statusCode = 500i16;
             errorContext.subStatusCode = 0i16;
 
+
             const auto hr = TryCreateApplication(pHttpContext, options, errorContext);
 
             if (FAILED_LOG(hr))
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/inprocess_application_tests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/inprocess_application_tests.cpp
@@ -39,7 +39,7 @@ namespace InprocessTests
             {"InProcessExeLocation", exePath.data()}
         };
 
-        IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), parameters.data(), 1, std::wstring());
+        IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), parameters.data(), 1);
 
         ASSERT_STREQ(app->QueryExeLocation().c_str(), L"hello");
     }
@@ -59,7 +59,7 @@ namespace InprocessTests
             .WillByDefault(testing::Return(L""));
 
         auto requestHandlerConfig = std::unique_ptr<InProcessOptions>(MockInProcessOptions::CreateConfig());
-        IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0, std::wstring());
+        IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0);
 
         ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/SECTION5");
     }
@@ -79,7 +79,7 @@ namespace InprocessTests
             .WillByDefault(testing::Return(L""));
 
         auto requestHandlerConfig = std::unique_ptr<InProcessOptions>(MockInProcessOptions::CreateConfig());
-        IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0, std::wstring());
+        IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0);
 
         ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/");
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/ShuttingDownApplication.h
@@ -31,8 +31,8 @@ class ShuttingDownHandler : public REQUEST_HANDLER
 class ShuttingDownApplication : public InProcessApplicationBase
 {
 public:
-    ShuttingDownApplication(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication, std::wstring shadowCopy)
-        : InProcessApplicationBase(pHttpServer, pHttpApplication, shadowCopy)
+    ShuttingDownApplication(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication)
+        : InProcessApplicationBase(pHttpServer, pHttpApplication, std::wstring())
     {
     }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h
@@ -18,15 +18,14 @@ class StartupExceptionApplication : public InProcessApplicationBase
         const std::string& errorPageContent,
         USHORT statusCode,
         USHORT subStatusCode,
-        const std::string& statusText,
-        std::wstring shadowCopy)
+        const std::string& statusText)
         : m_disableLogs(disableLogs),
         m_HR(hr),
         m_error(errorPageContent),
         m_statusCode(statusCode),
         m_subStatusCode(subStatusCode),
         m_statusText(std::move(statusText)),
-        InProcessApplicationBase(pServer, pApplication, shadowCopy)
+        InProcessApplicationBase(pServer, pApplication, std::wstring())
     {
     }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp
@@ -103,7 +103,6 @@ CreateApplication(
 {
     TraceContextScope traceScope(FindParameter<IHttpTraceContext*>("TraceContext", pParameters, nParameters));
     const auto pSite = FindParameter<IHttpSite*>("Site", pParameters, nParameters);
-    const auto shadowCopyPtr = FindParameter<PCWSTR>("ShadowCopyDirectory", pParameters, nParameters);
 
     try
     {
@@ -114,7 +113,7 @@ CreateApplication(
         // means that server is shutting does and request arrived in the meantime
         if (g_fInProcessApplicationCreated)
         {
-            *ppApplication = new ShuttingDownApplication(*pServer, *pHttpApplication, shadowCopyPtr);
+            *ppApplication = new ShuttingDownApplication(*pServer, *pHttpApplication);
             return S_OK;
         }
 
@@ -129,7 +128,7 @@ CreateApplication(
         errorContext.generalErrorType = "ASP.NET Core app failed to start";
         errorContext.errorReason = "<ul><li>The app failed to start</li><li>The app started but then stopped</li><li>The app started but threw an exception during startup</li></ul>";
 
-        if (!FAILED_LOG(hr = IN_PROCESS_APPLICATION::Start(*pServer, pSite, *pHttpApplication, pParameters, nParameters, inProcessApplication, errorContext, shadowCopyPtr)))
+        if (!FAILED_LOG(hr = IN_PROCESS_APPLICATION::Start(*pServer, pSite, *pHttpApplication, pParameters, nParameters, inProcessApplication, errorContext)))
         {
             *ppApplication = inProcessApplication.release();
         }
@@ -155,8 +154,7 @@ CreateApplication(
                 content,
                 errorContext.statusCode,
                 errorContext.subStatusCode,
-                "Internal Server Error",
-                shadowCopyPtr);
+                "Internal Server Error");
 
             RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline());
             *ppApplication = pErrorApplication.release();
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
@@ -21,9 +21,10 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION(
     IHttpApplication& pApplication,
     std::unique_ptr<InProcessOptions> pConfig,
     APPLICATION_PARAMETER* pParameters,
-    DWORD                  nParameters,
-    std::wstring shadowCopy) :
-    InProcessApplicationBase(pHttpServer, pApplication, shadowCopy),
+    DWORD                  nParameters) :
+    InProcessApplicationBase(pHttpServer,
+        pApplication,
+        FindParameter<PCWSTR>("ShadowCopyDirectory", pParameters, nParameters)),
     m_Initialized(false),
     m_blockManagedCallbacks(true),
     m_waitForShutdown(true),
@@ -249,7 +250,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication()
                 LOG_INFOF(L"Setting dll directory to %s", currentDirectory.c_str());
             }
 
-            // Keep as original directory
+            // I think I still want this to be the current directory
             LOG_LAST_ERROR_IF(!SetCurrentDirectory(this->QueryApplicationPhysicalPath().c_str()));
 
             LOG_INFOF(L"Setting current directory to %s", this->QueryApplicationPhysicalPath().c_str());
@@ -413,15 +414,14 @@ HRESULT IN_PROCESS_APPLICATION::Start(
     APPLICATION_PARAMETER* pParameters,
     DWORD nParameters,
     std::unique_ptr<IN_PROCESS_APPLICATION, IAPPLICATION_DELETER>& application,
-    ErrorContext& errorContext,
-    std::wstring shadowCopy)
+    ErrorContext& errorContext)
 {
     try
     {
         std::unique_ptr<InProcessOptions> options;
         THROW_IF_FAILED(InProcessOptions::Create(pServer, pSite, pHttpApplication, options));
         application = std::unique_ptr<IN_PROCESS_APPLICATION, IAPPLICATION_DELETER>(
-            new IN_PROCESS_APPLICATION(pServer, pHttpApplication, std::move(options), pParameters, nParameters, shadowCopy));
+            new IN_PROCESS_APPLICATION(pServer, pHttpApplication, std::move(options), pParameters, nParameters));
         THROW_IF_FAILED(application->LoadManagedApplication(errorContext));
         return S_OK;
     }
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
@@ -23,8 +23,7 @@ class IN_PROCESS_APPLICATION : public InProcessApplicationBase
         IHttpApplication& pApplication,
         std::unique_ptr<InProcessOptions> pConfig,
         APPLICATION_PARAMETER *pParameters,
-        DWORD                  nParameters,
-        std::wstring shadowCopy);
+        DWORD                  nParameters);
 
     ~IN_PROCESS_APPLICATION();
 
@@ -115,8 +114,7 @@ class IN_PROCESS_APPLICATION : public InProcessApplicationBase
         APPLICATION_PARAMETER* pParameters,
         DWORD nParameters,
         std::unique_ptr<IN_PROCESS_APPLICATION, IAPPLICATION_DELETER>& application,
-        ErrorContext& errorContext,
-        std::wstring shadowCopy);
+        ErrorContext& errorContext);
 
 private:
     struct ExecuteClrContext: std::enable_shared_from_this<ExecuteClrContext>
@@ -180,6 +178,7 @@ class IN_PROCESS_APPLICATION : public InProcessApplicationBase
 
     inline static const LPCSTR      s_exeLocationParameterName = "InProcessExeLocation";
 
+
     VOID
     UnexpectedThreadExit(const ExecuteClrContext& context) const;
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp
@@ -252,7 +252,6 @@ CreateApplication(
 {
     TraceContextScope traceScope(FindParameter<IHttpTraceContext*>("TraceContext", pParameters, nParameters));
     auto pSite = FindParameter<IHttpSite*>("Site", pParameters, nParameters);
-    auto shadowCopy = FindParameter<PCWSTR> ("ShadowCopyDirectory", pParameters, nParameters);
 
     InitializeGlobalConfiguration(pServer);
 
@@ -262,7 +261,7 @@ CreateApplication(
 
     RETURN_IF_FAILED(EnsureOutOfProcessInitializtion(pHttpApplication));
 
-    std::unique_ptr<OUT_OF_PROCESS_APPLICATION> pApplication = std::make_unique<OUT_OF_PROCESS_APPLICATION>(*pHttpApplication, std::move(pRequestHandlerConfig), shadowCopy);
+    std::unique_ptr<OUT_OF_PROCESS_APPLICATION> pApplication = std::make_unique<OUT_OF_PROCESS_APPLICATION>(*pHttpApplication, std::move(pRequestHandlerConfig));
 
     RETURN_IF_FAILED(pApplication->Initialize());
     RETURN_IF_FAILED(pApplication->StartMonitoringAppOffline());
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
@@ -7,9 +7,8 @@
 
 OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION(
     IHttpApplication& pApplication,
-    std::unique_ptr<REQUESTHANDLER_CONFIG> pConfig,
-    std::wstring shadowCopy) :
-    AppOfflineTrackingApplication(pApplication, shadowCopy),
+    std::unique_ptr<REQUESTHANDLER_CONFIG> pConfig) :
+    AppOfflineTrackingApplication(pApplication, std::wstring()),
     m_fWebSocketSupported(WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN),
     m_pConfig(std::move(pConfig))
 {
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.h
@@ -17,8 +17,7 @@ class OUT_OF_PROCESS_APPLICATION : public AppOfflineTrackingApplication
 public:
     OUT_OF_PROCESS_APPLICATION(
         IHttpApplication& pApplication,
-        std::unique_ptr<REQUESTHANDLER_CONFIG> pConfig,
-        std::wstring shadowCopy);
+        std::unique_ptr<REQUESTHANDLER_CONFIG> pConfig);
 
     __override
     ~OUT_OF_PROCESS_APPLICATION() override;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/AppOfflineTrackingApplication.cpp
@@ -45,6 +45,7 @@ HRESULT AppOfflineTrackingApplication::StartMonitoringAppOflineImpl()
     RETURN_IF_FAILED(m_fileWatcher->Create(m_applicationPath.c_str(),
         L"app_offline.htm",
         /* fTrackDllChanges */ !m_shadowCopyDirectory.empty(),
+        m_shadowCopyDirectory,
         this));
 
     return S_OK;
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
@@ -18,7 +18,7 @@ FILE_WATCHER::FILE_WATCHER() :
 FILE_WATCHER::~FILE_WATCHER()
 {
     StopMonitor();
-    WaitForMonitor(100);
+    WaitForMonitor(20);
 }
 
 void FILE_WATCHER::WaitForMonitor(DWORD dwRetryCounter)
@@ -59,9 +59,11 @@ FILE_WATCHER::Create(
     _In_ PCWSTR                  pszDirectoryToMonitor,
     _In_ PCWSTR                  pszFileNameToMonitor,
     _In_ bool                    fTrackDllChanges,
+    _In_ std::wstring            shadowCopyPath,
     _In_ AppOfflineTrackingApplication *pApplication
 )
 {
+    _shadowCopyPath = shadowCopyPath;
     RETURN_LAST_ERROR_IF_NULL(m_hCompletionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0));
 
     RETURN_LAST_ERROR_IF_NULL(m_hChangeNotificationThread = CreateThread(NULL,
@@ -286,12 +288,15 @@ HRESULT
     {
         // Reference application before
         _pApplication->ReferenceApplication();
-        //if (fDllChanged)
-        //{
-        //    // wait for all file changes to complete
-        //    PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL);
-        //}
+        if (fDllChanged)
+        {
+            // wait for all file changes to complete
+            PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL);
+            WaitForMonitor(100); // 5 seconds here.
 
+            // Copy contents before shutdown
+            RETURN_IF_FAILED(Environment::CopyToDirectory(_shadowCopyPath, _strDirectoryName.QueryStr(), false));
+        }
         RETURN_LAST_ERROR_IF(!QueueUserWorkItem(RunNotificationCallback, _pApplication.get(), WT_EXECUTEDEFAULT));
     }
 
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.h
@@ -29,6 +29,7 @@ class FILE_WATCHER{
         _In_ PCWSTR                  pszDirectoryToMonitor,
         _In_ PCWSTR                  pszFileNameToMonitor,
         _In_ bool                    fTrackDllChanges,
+        _In_ std::wstring            shadowCopyPath,
         _In_ AppOfflineTrackingApplication *pApplication
     );
 
@@ -57,6 +58,7 @@ class FILE_WATCHER{
     STRU                    _strFullName;
     LONG                    _lStopMonitorCalled {};
     bool                    _fTrackDllChanges;
+    std::wstring            _shadowCopyPath;
     OVERLAPPED              _overlapped;
     std::unique_ptr<AppOfflineTrackingApplication, IAPPLICATION_DELETER> _pApplication;
 };

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ namespace InprocessTests`
`39`	`39`	`{"InProcessExeLocation", exePath.data()}`
`40`	`40`	`};`
`41`	`41`
`42`		`- IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), parameters.data(), 1, std::wstring());`
	`42`	`+ IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), parameters.data(), 1);`
`43`	`43`
`44`	`44`	`ASSERT_STREQ(app->QueryExeLocation().c_str(), L"hello");`
`45`	`45`	`}`
`@@ -59,7 +59,7 @@ namespace InprocessTests`
`59`	`59`	`.WillByDefault(testing::Return(L""));`
`60`	`60`
`61`	`61`	`auto requestHandlerConfig = std::unique_ptr<InProcessOptions>(MockInProcessOptions::CreateConfig());`
`62`		`- IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0, std::wstring());`
	`62`	`+ IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0);`
`63`	`63`
`64`	`64`	`ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/SECTION5");`
`65`	`65`	`}`
`@@ -79,7 +79,7 @@ namespace InprocessTests`
`79`	`79`	`.WillByDefault(testing::Return(L""));`
`80`	`80`
`81`	`81`	`auto requestHandlerConfig = std::unique_ptr<InProcessOptions>(MockInProcessOptions::CreateConfig());`
`82`		`- IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0, std::wstring());`
	`82`	`+ IN_PROCESS_APPLICATION *app = new IN_PROCESS_APPLICATION(server, application, std::move(requestHandlerConfig), nullptr, 0);`
`83`	`83`
`84`	`84`	`ASSERT_STREQ(app->QueryApplicationVirtualPath().c_str(), L"/");`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ class ShuttingDownHandler : public REQUEST_HANDLER`
`31`	`31`	`class ShuttingDownApplication : public InProcessApplicationBase`
`32`	`32`	`{`
`33`	`33`	`public:`
`34`		`- ShuttingDownApplication(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication, std::wstring shadowCopy)`
`35`		`- : InProcessApplicationBase(pHttpServer, pHttpApplication, shadowCopy)`
	`34`	`+ ShuttingDownApplication(IHttpServer& pHttpServer, IHttpApplication& pHttpApplication)`
	`35`	`+ : InProcessApplicationBase(pHttpServer, pHttpApplication, std::wstring())`
`36`	`36`	`{`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ CreateApplication(`
`103`	`103`	`{`
`104`	`104`	`TraceContextScope traceScope(FindParameter<IHttpTraceContext*>("TraceContext", pParameters, nParameters));`
`105`	`105`	`const auto pSite = FindParameter<IHttpSite*>("Site", pParameters, nParameters);`
`106`		`- const auto shadowCopyPtr = FindParameter<PCWSTR>("ShadowCopyDirectory", pParameters, nParameters);`
`107`	`106`
`108`	`107`	`try`
`109`	`108`	`{`
`@@ -114,7 +113,7 @@ CreateApplication(`
`114`	`113`	`// means that server is shutting does and request arrived in the meantime`
`115`	`114`	`if (g_fInProcessApplicationCreated)`
`116`	`115`	`{`
`117`		`- ppApplication = new ShuttingDownApplication(pServer, *pHttpApplication, shadowCopyPtr);`
	`116`	`+ ppApplication = new ShuttingDownApplication(pServer, *pHttpApplication);`
`118`	`117`	`return S_OK;`
`119`	`118`	`}`
`120`	`119`
`@@ -129,7 +128,7 @@ CreateApplication(`
`129`	`128`	`errorContext.generalErrorType = "ASP.NET Core app failed to start";`
`130`	`129`	`errorContext.errorReason = "<ul><li>The app failed to start</li><li>The app started but then stopped</li><li>The app started but threw an exception during startup</li></ul>";`
`131`	`130`
`132`		`- if (!FAILED_LOG(hr = IN_PROCESS_APPLICATION::Start(pServer, pSite, pHttpApplication, pParameters, nParameters, inProcessApplication, errorContext, shadowCopyPtr)))`
	`131`	`+ if (!FAILED_LOG(hr = IN_PROCESS_APPLICATION::Start(pServer, pSite, pHttpApplication, pParameters, nParameters, inProcessApplication, errorContext)))`
`133`	`132`	`{`
`134`	`133`	`*ppApplication = inProcessApplication.release();`
`135`	`134`	`}`
`@@ -155,8 +154,7 @@ CreateApplication(`
`155`	`154`	`content,`
`156`	`155`	`errorContext.statusCode,`
`157`	`156`	`errorContext.subStatusCode,`
`158`		`- "Internal Server Error",`
`159`		`- shadowCopyPtr);`
	`157`	`+ "Internal Server Error");`
`160`	`158`
`161`	`159`	`RETURN_IF_FAILED(pErrorApplication->StartMonitoringAppOffline());`
`162`	`160`	`*ppApplication = pErrorApplication.release();`