Skip to content

Conversation

@alexeybakhtin
Copy link

@alexeybakhtin alexeybakhtin commented Feb 20, 2025

Please review the backport of JDK-8335181

src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java

  • manual merge for MultiExchange::getExceptionalCF
    because of the difference in the logging caused by 8310330

src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java

  • added import for the AtomicLong class manually because of the difference in the import section

src/java.net.http/share/classes/jdk/internal/net/http/ExchangeImpl.java

  • copyright year updated manually

test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServerConnection.java

  • import section is updated manually

test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java

  • getConnectionKey() declaration is added manually in the HttpServerAdapters::HttpTestExchange class

All jtreg tests for java.net.httpclient are passed


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8335181 needs maintainer approval

Issue

  • JDK-8335181: Incorrect handling of HTTP/2 GOAWAY frames in HttpClient (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/1417/head:pull/1417
$ git checkout pull/1417

Update a local copy of the PR:
$ git checkout pull/1417
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/1417/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1417

View PR using the GUI difftool:
$ git pr show -t 1417

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/1417.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 20, 2025

👋 Welcome back abakhtin! A progress list of the required criteria for merging this PR into pr/1416 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Feb 20, 2025

@alexeybakhtin This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8335181: Incorrect handling of HTTP/2 GOAWAY frames in HttpClient

Reviewed-by: andrew

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • a5678d3: 8350682: [JMH] vector.IndexInRangeBenchmark failed with IndexOutOfBoundsException for size=1024
  • 6bee54c: 8335662: [AArch64] C1: guarantee(val < (1ULL << nbits)) failed: Field too big for insn
  • 47aafc2: 8350412: [21u] AArch64: Ambiguous frame layout leads to incorrect traces in JFR

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport 720b44648bcff997278af92746f942b2425298a5 8335181: Incorrect handling of HTTP/2 GOAWAY frames in HttpClient Feb 20, 2025
@openjdk
Copy link

openjdk bot commented Feb 20, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Feb 20, 2025
@mlbridge
Copy link

mlbridge bot commented Feb 20, 2025

Webrevs

@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8335181
git fetch https://git.openjdk.org/jdk21u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@gnu-andrew
Copy link
Member

gnu-andrew commented Mar 19, 2025

Can you rebase this onto current jdk21u-dev? At the moment I'm seeing code from 8316580 in the diff? Thanks.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Backport looks good. Http2Connection.java & Http2TestServerConnection.java copyright headers were already updated by JDK-8328286 and so didn't need the update from this patch.

@openjdk
Copy link

openjdk bot commented Mar 20, 2025

⚠️ @alexeybakhtin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Mar 20, 2025
@alexeybakhtin
Copy link
Author

Thanks. Backport looks good. Http2Connection.java & Http2TestServerConnection.java copyright headers were already updated by JDK-8328286 and so didn't need the update from this patch.

Thank you for the review

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Mar 20, 2025

@gnu-andrew
8335181: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Mar 20, 2025
@alexeybakhtin
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 20, 2025

Going to push as commit 209939a.
Since your change was applied there have been 3 commits pushed to the master branch:

  • a5678d3: 8350682: [JMH] vector.IndexInRangeBenchmark failed with IndexOutOfBoundsException for size=1024
  • 6bee54c: 8335662: [AArch64] C1: guarantee(val < (1ULL << nbits)) failed: Field too big for insn
  • 47aafc2: 8350412: [21u] AArch64: Ambiguous frame layout leads to incorrect traces in JFR

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 20, 2025
@openjdk openjdk bot closed this Mar 20, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 20, 2025
@openjdk
Copy link

openjdk bot commented Mar 20, 2025

@alexeybakhtin Pushed as commit 209939a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants