Fix IIS recycle regressions #59998
Open
Fix IIS recycle regressions #59998
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BrennanConroy
added
feature-iis
BrennanConroy
commented
Jan 22, 2025
| @@ -51,7 +51,7 @@ internal IISTestSiteFixture(Action<IISDeploymentParameters> configure) | |||
| //DeploymentParameters.EnvironmentVariables.Add("ASPNETCORE_MODULE_DEBUG", "console"); | |||
|
|
|||
| // This queue does not have websockets enabled currently, adding the module will break all tests using this fixture. | |||
| if (!HelixHelper.GetTargetHelixQueue().ToLowerInvariant().Contains("windows.amd64.server2022")) | |||
| if (!(HelixHelper.GetTargetHelixQueue() ?? "").ToLowerInvariant().Contains("windows.amd64.server2022")) | |||
There was a problem hiding this comment.
Fix local websocket tests.
BrennanConroy
commented
Jan 22, 2025
| <logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" /> | ||
| <traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" /> | ||
| <logFile logFormat="W3C" directory="%TEMP%\IISTests\Logs" /> | ||
| <traceFailedRequestsLogging directory="%TEMP%\IISTests\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" /> |
There was a problem hiding this comment.
Write logs to temp instead of user directory. If you know, you know.
BrennanConroy
requested review from
halter73,
JamesNK and
mgravell
as code owners
There was a problem hiding this comment.
Copilot reviewed 5 out of 19 changed files in this pull request and generated no comments.
Files not reviewed (14)
- src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.cpp: Language not supported
- src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationmanager.h: Language not supported
- src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/globalmodule.cpp: Language not supported
- src/Servers/IIS/IntegrationTesting.IIS/src/Http.SubApp.config: Language not supported
- src/Servers/IIS/IntegrationTesting.IIS/src/Http.config: Language not supported
- src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs: Evaluated as low risk
- src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentParameterExtensions.cs: Evaluated as low risk
- src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs: Evaluated as low risk
- src/Servers/IIS/IIS/test/Common.LongTests/StartupTests.cs: Evaluated as low risk
- src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/EventLogHelpers.cs: Evaluated as low risk
- src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/IISTestSiteFixture.cs: Evaluated as low risk
- src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployerBase.cs: Evaluated as low risk
- src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs: Evaluated as low risk
- src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs: Evaluated as low risk
Comments suppressed due to low confidence (2)
src/Servers/IIS/IIS/test/Common.FunctionalTests/Infrastructure/Helpers.cs:259
- Ensure that the change to select the last site element is covered by tests.
.Elements("site").Last();
src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs:34
- The variable
_siteIdis incremented without any checks or resets. This could potentially lead to an overflow if the application runs for a very long time and many sites are created. Consider adding a check to reset or handle the overflow scenario.
private int _siteId = 2;
| @@ -161,18 +161,18 @@ public static string InProcessStarted(IISDeploymentResult deploymentResult) | |||
|
|
|||
| public static string OutOfProcessStarted(IISDeploymentResult deploymentResult) | |||
| { | |||
| return $"Application '/LM/W3SVC/1/ROOT' started process '\\d+' successfully and process '\\d+' is listening on port '\\d+'."; | |||
| return $"Application '/LM/W3SVC/\\d+/ROOT' started process '\\d+' successfully and process '\\d+' is listening on port '\\d+'."; | |||
There was a problem hiding this comment.
Why are we loosening from strictly matching on 1 to any digit here? I see there are other updates related to multi-site handling in this PR. Does that address the regression or is it a new feature?
There was a problem hiding this comment.
Multi-site handling was added to add test coverage for the regression. Technically we might be able to pass in the site id to these methods so it's not using regex.
adityamandaleeka
approved these changes
Feb 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #58939 and both issues mentioned in #54531, both the empty path issue described in the initial post and the bad shutdown mentioned in #54531 (comment)
These were regressed by #52807
The two regressions were:
disallowRotationOnConfigChangewastruewe would still shutdown the application on config changes.The third fix wasn't a regression but was simple enough to fix and part of one of the issues linked above so included a fix for it. Our usage of
_wcsicmpdidn't properly check the path started with"MACHINE/WEBROOT", it would pass for"", or"MAC","MACHINE/W", etc.We have the test
ConfigurationChangeCanBeIgnoredInProcesswhich should have caught one of the regressions, but since it was testing for the lack of app shutdown it doesn't have any way to know that nothing happened, fixed the test to have a bit of a delay so it has a better chance of failing in the future if we regress this.We also have a multiple application test, but it was only running for IISExpress and it didn't have a restart scenario. Moved the test to the common tests so it's run by IIS as well and added a scenario where 1 of the applications restarts but the others don't.