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

8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream #309

Closed

Conversation

evwhelan
Copy link
Contributor

@evwhelan evwhelan commented Nov 24, 2021

Hi all,

Please review my clean backport of JDK-8263364.

This adds some test stability to the sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java test.

I verified the fix by running a test-repeat of 25 on this test.

Kind regards,
Evan


Progress

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

Issue

  • JDK-8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u pull/309/head:pull/309
$ git checkout pull/309

Update a local copy of the PR:
$ git checkout pull/309
$ git pull https://git.openjdk.java.net/jdk17u pull/309/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 309

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u/pull/309.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 24, 2021

👋 Welcome back ewhelan! 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 changed the title Backport 5caa77b043ae490c3d7d56d181d0e07e6b859b9e 8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream Nov 24, 2021
@openjdk
Copy link

openjdk bot commented Nov 24, 2021

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

@openjdk
Copy link

openjdk bot commented Nov 24, 2021

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

8263364: sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java wedged in getInputStream

Reviewed-by: dfuchs

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

  • a6c3b5d: 8277981: String Deduplication table is never cleaned up due to bad dead_factor_for_cleanup
  • 5406f14: 8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run/user/* mount points
  • 1e4ec1d: 8274265: Suspicious string concatenation in logTestUtils.inline.hpp
  • cd6234d: 8274716: JDWP Spec: the description for the Dispose command confuses suspend with resume.
  • a1049e8: 8275720: CommonComponentAccessibility.createWithParent isWrapped causes mem leak
  • 565ec1a: 8275863: Use encodeASCII for ASCII-compatible DoubleByte encodings
  • 14a1f2a: 8274242: Implement fast-path for ASCII-compatible CharsetEncoders on x86
  • 670d73e: 8276774: Cookie stored in CookieHandler not sent if user headers contain cookie

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dfuch) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 24, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 24, 2021

Webrevs

Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

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

LGTM

* @bug 4533243
* @summary Closing a keep alive stream gives NullPointerException
* @bug 4533243 8263364
* @summary Closing a keep alive stream should not give NullPointerException and should accept a connection from a
Copy link
Member

Choose a reason for hiding this comment

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

The summary should preferably tell what functionality/API/behavior the test is testing.
Sorry I missed that in the original fix to the main line.
Since this is a backport I agree to keep the @summary in sync with what is in the mainline.

ByteArrayOutputStream clientBytes;
clientSocket = null;

// in a concurrent test environment it can happen that other rouge clients connect to this server
Copy link
Member

Choose a reason for hiding this comment

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

I guess clients are rogue and not rouge ;-)
Maybe we should clean that up in the mainline next time we revisit this test...

@evwhelan
Copy link
Contributor Author

evwhelan commented Dec 1, 2021

Closing due to missing the 17.0.2 cut off

Edit: spoke to maintainers, will be able to push this to 17.0.2

@evwhelan evwhelan closed this Dec 1, 2021
@evwhelan evwhelan reopened this Dec 2, 2021
@evwhelan
Copy link
Contributor Author

evwhelan commented Dec 2, 2021

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 2, 2021
@openjdk
Copy link

openjdk bot commented Dec 2, 2021

@evwhelan
Your change (at version 08e83de) is now ready to be sponsored by a Committer.

@robm-openjdk
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 6, 2021

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

  • a6c3b5d: 8277981: String Deduplication table is never cleaned up due to bad dead_factor_for_cleanup
  • 5406f14: 8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run/user/* mount points
  • 1e4ec1d: 8274265: Suspicious string concatenation in logTestUtils.inline.hpp
  • cd6234d: 8274716: JDWP Spec: the description for the Dispose command confuses suspend with resume.
  • a1049e8: 8275720: CommonComponentAccessibility.createWithParent isWrapped causes mem leak
  • 565ec1a: 8275863: Use encodeASCII for ASCII-compatible DoubleByte encodings
  • 14a1f2a: 8274242: Implement fast-path for ASCII-compatible CharsetEncoders on x86
  • 670d73e: 8276774: Cookie stored in CookieHandler not sent if user headers contain cookie

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Dec 6, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 6, 2021
@openjdk
Copy link

openjdk bot commented Dec 6, 2021

@robm-openjdk @evwhelan Pushed as commit fbb7f2d.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants