Drain requests in native instead of managed #6816
Merged
Conversation
This file contains hidden or 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
jkotalik
commented
Jan 17, 2019
| @@ -259,7 +265,7 @@ IN_PROCESS_APPLICATION::ExecuteApplication() | |||
| if (m_waitForShutdown) | |||
| { | |||
| const auto clrWaitResult = WaitForSingleObject(m_clrThread.native_handle(), m_pConfig->QueryShutdownTimeLimitInMS()); | |||
| THROW_LAST_ERROR_IF(waitResult == WAIT_FAILED); | |||
| THROW_LAST_ERROR_IF(clrWaitResult == WAIT_FAILED); | |||
There was a problem hiding this comment.
This is unrelated, I just noticed that we were checking the wrong wait timeout here.
pakrym
reviewed
Jan 17, 2019
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
Outdated
Show resolved
Hide resolved
pakrym
reviewed
Jan 17, 2019
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
Outdated
Show resolved
Hide resolved
pakrym
reviewed
Jan 17, 2019
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
Outdated
Show resolved
Hide resolved
|
Add a test that opens a hanging connection and requests shutdown, assert that event logs are correct and it doesn't crash. |
pakrym
reviewed
Jan 17, 2019
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
Show resolved
Hide resolved
pakrym
reviewed
Jan 17, 2019
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
Outdated
Show resolved
Hide resolved
pakrym
reviewed
Jan 17, 2019
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
Show resolved
Hide resolved
|
🆙 📅 |
pakrym
reviewed
Jan 18, 2019
src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs
Outdated
Show resolved
Hide resolved
pakrym
reviewed
Jan 18, 2019
src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
Outdated
Show resolved
Hide resolved
pakrym
reviewed
Jan 18, 2019
pakrym
reviewed
Jan 18, 2019
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
Outdated
Show resolved
Hide resolved
pakrym
reviewed
Jan 18, 2019
jkotalik
force-pushed
the
jkotalik/appOfflineFlaky
branch
from
39080bb to
f52cb2c
Compare
pakrym
approved these changes
Jan 18, 2019
|
Don't merge until preview 2 ships. |
jkotalik
added
the
blocked
jkotalik
force-pushed
the
jkotalik/appOfflineFlaky
branch
from
ab1abc1 to
bd4196d
Compare
jkotalik
removed
the
blocked
davidfowl
reviewed
Jan 27, 2019
| @@ -97,6 +98,11 @@ public Task StopAsync(CancellationToken cancellationToken) | |||
| { | |||
| _nativeApplication.StopIncomingRequests(); | |||
|
|
|||
| _cancellationTokenRegistration = cancellationToken.Register(() => | |||
| { | |||
| _shutdownSignal.TrySetResult(null); | |||
amcasey
added
area-networking
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.
For #6605 and #6555.
There is a race condition when shutting down and another request coming into the server. Managed perceives that there are no requests remaining, but in native, a request can be instantiated and try to call into managed, which causes app verifier to crash iisexpress/w3wp.