Skip to content

8338569: HTTP/1.1 CleanupTrigger may be triggerred after the next exchange started#20623

Closed
dfuch wants to merge 5 commits intoopenjdk:masterfrom
dfuch:CleanupTrigger-2-JDK-8338569
Closed

8338569: HTTP/1.1 CleanupTrigger may be triggerred after the next exchange started#20623
dfuch wants to merge 5 commits intoopenjdk:masterfrom
dfuch:CleanupTrigger-2-JDK-8338569

Conversation

@dfuch
Copy link
Member

@dfuch dfuch commented Aug 19, 2024

The java/net/httpclient/DigestEchoClient.java fails intemittently with IOException: HTTP/1.1 header parser received no bytes.

Analysis shows that this is caused by the CleanupTrigger which receives data after the reused connection has been taken out of the HTTP/1.1 clear pool. This should not happen.

The issue is caused by deferred registration of read subscribers with the SocketTube. The subscribers are registered within the SelectorManager thread to ensure proper interaction with the read method.

Sometimes pending subscribers are pushed faster than they are actually subscribed, which may cause the wrong subscriber to be subscribed at the wrong time.

This is a redo of JDK-8336655 which was a failed fix.
The main difference is that the new fix uses a ConcurrentLinkedQueue to make sure all subscribers get subscribed and dropped in the right sequence. Marking previous subscription as stopped ensures that data can only be routed to the last subscriber in the queue.


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

Issue

  • JDK-8338569: HTTP/1.1 CleanupTrigger may be triggerred after the next exchange started (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/20623/head:pull/20623
$ git checkout pull/20623

Update a local copy of the PR:
$ git checkout pull/20623
$ git pull https://git.openjdk.org/jdk.git pull/20623/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20623

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/20623.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 19, 2024

👋 Welcome back dfuchs! A progress list of the required criteria for merging this PR into master 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 Aug 19, 2024

@dfuch 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:

8338569: HTTP/1.1 CleanupTrigger may be triggerred after the next exchange started

Reviewed-by: jpai

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 2 new commits pushed to the master branch:

  • 0c2b175: 8328608: Multiple NewSessionTicket support for TLS
  • 379f3db: 8339175: ProblemList runtime/interpreter/LastJsrTest.java on all platforms with Xcomp

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 8338569 8338569: HTTP/1.1 CleanupTrigger may be triggerred after the next exchange started Aug 19, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 19, 2024
@openjdk
Copy link

openjdk bot commented Aug 19, 2024

@dfuch The following label will be automatically applied to this pull request:

  • net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the net net-dev@openjdk.org label Aug 19, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 19, 2024

Webrevs

@dfuch
Copy link
Member Author

dfuch commented Aug 22, 2024

Note: the changes to ShutdownNow.java are coincidental. I observed this test failing once in my many tests, and decided to make the exception it throws more explicit. FWIW - I had also observed this test failing before the change, it's intermittent and rare. I took the opportunity to raise the timeout from 2000 to 2500.

Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

This looks OK to me. Some of the files will need a copyright year update before integrating.

@dfuch
Copy link
Member Author

dfuch commented Aug 28, 2024

Copyright years have been updated and the stray printStackTrace() has been removed.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 28, 2024
@dfuch
Copy link
Member Author

dfuch commented Aug 28, 2024

Thanks Jaikiran. I will integrate tomorrow.

@dfuch
Copy link
Member Author

dfuch commented Aug 29, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Aug 29, 2024

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

  • 362f9ce: 8339120: Use more fine-granular gcc unused warnings
  • f080b4b: 8333098: ubsan: bytecodeInfo.cpp:318:59: runtime error: division by zero
  • ff59532: 8338678: Erroneous parameterized type represented as
  • 0b4a7d5: 8324859: Improve error recovery
  • 1383fec: 8327381: Refactor type-improving transformations in BoolNode::Ideal to BoolNode::Value
  • eb7ead5: 8336873: BasicSplitPaneDivider:oneTouchExpandableChanged() should mention that implementation depends on SplitPane.supportsOneTouchButtons property
  • 0ddcd70: 8335120: assert(!target->can_be_statically_bound() || target == cha_monomorphic_target) failed
  • 26e3d53: 8338716: Re-visit "interrupt handling" in jdk.internal.loader.Resource
  • 72a4900: 8338888: SystemDictionary::class_name_symbol has incorrect length check
  • a8ac287: 8339126: JNI exception pending in Inflater.c
  • ... and 7 more: https://git.openjdk.org/jdk/compare/b6700095c018a67a55b746cd4eee763c68f538e0...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 29, 2024

@dfuch Pushed as commit 723588a.

💡 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

integrated Pull request has been integrated net net-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

2 participants