Skip to content

Merge branch '4.1.x' into '4.2.x' #10099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Nov 10, 2023
Merged

Merge branch '4.1.x' into '4.2.x' #10099

merged 24 commits into from
Nov 10, 2023

Conversation

sdelamo
Copy link
Contributor

@sdelamo sdelamo commented Nov 10, 2023

No description provided.

yawkat and others added 24 commits October 23, 2023 15:56

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* Handle and log HTTP/2 GOAWAY frame
Fixes #9945

* add basic test

* Wind down connection when goaway is received (might help with #9933)

* oops

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* Add eq/hc for HttpVersionSelection

Fixes #9994

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
This was an oversight, but I think 0 should be handled the same way so not sure this PR changes anything in practice.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
It is legal for a reactive publisher to call onComplete immediately after subscribe, before data is requested. This could lead to a failure when such a publisher was queued for write.

Addresses #9677

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…ive (#10018)

Test case and fix for part of #9933.


---------

Co-authored-by: yawkat <jonas.konrad@oracle.com>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* tck: form-url-encoded with field with list

see: micronaut-projects/micronaut-serialization#616

* remove unused imports

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* Do not try to apply JsonView to failed responses
As the failed response contains a body not returned by the controller method, don't try to apply the controller's JsonView to it.

Fixes #9975

* fix test

* Apply suggestions from code review

Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>

* Update http-server-netty/src/main/java/io/micronaut/http/server/netty/jackson/JsonViewServerFilter.java

---------

Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
The blocking filter would cause onSubscribe to be delayed, leading to a logged exception when trying to request from upstream. This patch simply skips the request call in that case. The request will be done in onSubscribe later.

Also make sure the subscriber methods are only called on the event loop to avoid concurrency issues.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…0049)

I also found & fixed that ALL_INNER_CLASSES did not include interfaces and records.

Fixes #10042

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Connection.hasLiveRequests was set to true by the earmark operation at the start of Connection.dispatch, but the read timeout is only reset on the event loop just before dispatch0. That means that a read timeout could trigger after hasLiveRequests becomes true but before the reset, leading to an unhandled timeout and wasted connection.

The fix is to separate the "earmark" flag from the hasLiveRequests flag (or counter for HTTP/2). They will usually have the same value, except in the short interval before dispatch0, where earmark is true but hasLiveRequests is not. This means the read timeout is ignored before the timeout is reset.

Fixes #9899

Verified

This commit was signed with the committer’s verified signature.
sdelamo Sergio del Amo
see: #9969

Verified

This commit was signed with the committer’s verified signature.
sdelamo Sergio del Amo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
If the response is written before the request body is consumed, RIB would subscribe to the body to release the incoming data. This was not necessary, as PipeliningServerHandler already has more efficient discard logic triggered by closeIfNoSubscriber. This made no functional difference, but it's faster with this PR.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
* Cleanup Gradle JVM compatibility checks

* Unwrap enable preview

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
#10084)

* Reduce PoolTimeout flakiness

Try to reduce the flakiness by using Requires and AutoCleanup to try and reduce pollution that may be occuring

* Remove Shared from ClientIntroductionAdviceSpec as it needs a fresh server each test

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Seems the test was just broken. The internal error goaway frame made netty close the channel, which may send some bogus TLS and doesn't actually hit the code this test was supposed to test.

Please try on mac.

Verified

This commit was signed with the committer’s verified signature.
sdelamo Sergio del Amo
…le:/{JAR_PATH}!/{PREFIX}!/{RESOURCE}` gracefully (#10092)

Verified

This commit was signed with the committer’s verified signature.
sdelamo Sergio del Amo

Verified

This commit was signed with the committer’s verified signature.
sdelamo Sergio del Amo
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 5 Code Smells

83.2% 83.2% Coverage
0.0% 0.0% Duplication

@sdelamo sdelamo merged commit 9f427f2 into 4.2.x Nov 10, 2023
@sdelamo sdelamo deleted the mergeup3 branch November 10, 2023 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants