Skip to content
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

Jump to bottom

8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY" #1567

Closed
wants to merge 4 commits into from
Closed

8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY" #1567

wants to merge 4 commits into from

Conversation

dfuch
Copy link
Member

@dfuch dfuch commented Dec 2, 2020 •
edited by openjdk[bot] bot

Hi,

Please find below a fix that fixes an issue in Http2TestServerConnection - where the
connection will be closed by the test server if the test server receives a RESET from the client
after the stream has been closed.

This issue has made the ThrowingPushPromisesAsStringCustom test fail from time to time, but
the debug traces have eventually revealed what was the issue:

DEBUG: [readLoop] [818ms] FramesDecoder Got frame: RESET: length=4, streamid=24, flags=0 Error: Stream cancelled
TestServer: Unexpected frame on: 24
RESET: length=4, streamid=24, flags=0 Error: Stream cancelled
Http server reader thread shutdown
java.io.IOException: Unexpected frame
at Http2TestServerConnection.readLoop(Http2TestServerConnection.java:776)
at Http2TestServerConnection$ConnectionThread.run(Http2TestServerConnection.java:438)
Server connection to /127.0.0.1:39830 stopping. 5 streams

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY"

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1567/head:pull/1567
$ git checkout pull/1567

@dfuch
8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwi…
559d992 
…ng in GET_BODY"

Fixes an issue in Http2TestServerConnection - where the connection will be closed by
the server if the server receives a RESET from the client after the stream has been
closed on the server side.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 2, 2020

👋 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 openjdk bot added the rfr label Dec 2, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 2, 2020

@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 label Dec 2, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 2, 2020 •
edited

Webrevs

@dfuch
8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwi…
0d15b66 
…ng in GET_BODY"

Ammended fix to take into account reset frames received on either server streams
or client streams.
dfuch added 2 commits Dec 4, 2020
@dfuch
Merge
1e1fdf6
@dfuch
8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwi…
6c6e9b1 
…ng in GET_BODY"

Integrated review comments: added two static methods:
    static boolean isClientStreamId(int streamid);
    static boolean isServerStreamId(int streamid);
Michael-Mc-Mahon
Michael-Mc-Mahon approved these changes Dec 5, 2020
View changes
Copy link
Member

@Michael-Mc-Mahon Michael-Mc-Mahon left a comment

LGTM

@openjdk
Copy link

@openjdk openjdk bot commented Dec 5, 2020 •
edited

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

8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwing in GET_BODY"

Reviewed-by: michaelm

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

  • d3ac1bf: 8198390: Test MultiResolutionDrawImageWithTransformTest.java fails when -esa is passed
  • 51d325e: 8257633: Missing -mmacosx-version-min=X flag when linking libjvm
  • e27ea4d: 8257750: writeBuffer field of java.io.DataOutputStream should be final
  • dd0b945: 8257531: Super word not applied to a loop of simple Buffer operations
  • d76039d: 8257725: No throws of SSLHandshakeException
  • fcc8479: 8257724: Incorrect package of the linked class in BaseSSLSocketImpl
  • d8ac76f: 8257651: LambdaEagerInit.java test failed in 2 different ways
  • 3eb6946: 8257732: Problem list TestJFRWithJMX for OL 8.2 until the issue is resolved
  • ac54900: 8257401: Use switch expressions in jdk.internal.net.http and java.net.http
  • 86b6575: 8257574: C2: "failed: parsing found no loops but there are some" assert failure
  • ... and 49 more: https://git.openjdk.java.net/jdk/compare/93b6ab56ae1499616d38c0b62f4256f1d7c17ce5...master

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 added the ready label Dec 5, 2020
@dfuch
Copy link
Member Author

@dfuch dfuch commented Dec 7, 2020

/integrate

@openjdk openjdk bot closed this Dec 7, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 7, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 7, 2020

@dfuch Since your change was applied there have been 68 commits pushed to the master branch:

  • f5a582c: 8257575: C2: "failed: only phis" assert failure in loop strip mining verification
  • d05401d: 8256679: Update serialization javadoc once JOSS changes for records are complete
  • 7620124: 8257230: assert(InitialHeapSize >= MinHeapSize) failed: Ergonomics decided on incompatible initial and minimum heap sizes
  • 05dac03: 8257803: Add -Xbatch to compiler/blackhole tests
  • 29a09c8: 8257668: SA JMap - skip non-java thread stack dump for heap dump
  • e590618: 8252505: C1/C2 compiler support for blackholes
  • 972bc3b: 8256167: Convert JDK use of Reference::get to Reference::refersTo
  • 78be334: 8242332: Add SHA3 support to SunPKCS11 provider
  • c4339c3: 8243614: Typo in ReentrantLock's Javadoc
  • d3ac1bf: 8198390: Test MultiResolutionDrawImageWithTransformTest.java fails when -esa is passed
  • ... and 58 more: https://git.openjdk.java.net/jdk/compare/93b6ab56ae1499616d38c0b62f4256f1d7c17ce5...master

Your commit was automatically rebased without conflicts.

Pushed as commit 566d77a.

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

@dfuch dfuch deleted the reset-after-close-8254802 branch Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Michael-Mc-Mahon Michael-Mc-Mahon

Assignees
No one assigned
Labels
integrated net
Milestone
No milestone
2 participants
@dfuch @Michael-Mc-Mahon