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

frkator · 2021-06-11T10:46:32Z

@dfuch could you please review, thank you.

Progress

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

Issue

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

Reviewers

Daniel Fuchs (@dfuch - Reviewer) ⚠️ Review applies to 5a5dc15

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4472

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

Using diff file

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

bridgekeeper · 2021-06-11T10:47:35Z

👋 Welcome back isipka! 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 · 2021-06-11T10:51:08Z

@frkator 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.

mlbridge · 2021-06-11T10:56:10Z

Webrevs

dfuch

Globally looks good - still need some cleanup to make sure everything gets closed in the end.

test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java

dfuch

Looks good - small change still needed in XServer::close

test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java

openjdk · 2021-06-15T13:48:30Z

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

a522d6b: 8273376: Zero: Disable vtable/itableStub gtests
3cd95a2: 8231356: Fix broken ResourceObj::operator new[] in debug builds
81c719b: 8273333: Zero should warn about unimplemented -XX:+LogTouchedMethods
649c22c: 8270832: Aarch64: Update algorithm annotations for MacroAssembler::fill_words
eb22181: 8273386: Remove duplicated code in G1DCQS::abandon_completed_buffers

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).

frkator · 2021-06-15T15:59:22Z

/integrate

openjdk · 2021-06-15T16:00:17Z

@frkator
Your change (at version 5a5dc15) is now ready to be sponsored by a Committer.

bridgekeeper · 2021-08-04T16:00:49Z

@frkator This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

frkator · 2021-08-31T22:29:40Z

extend

dfuch · 2021-09-01T10:23:25Z

@frkator Looks like your force-push on Jul 7 caused the sponsor label to be removed. Has anything changed - do I need to re-review?
In any case you will need to /integrate again before this can move forward (and please avoid force-push in the future)

dfuch · 2021-09-02T14:37:16Z

Ah - I see that there are still problems with this test:

#section:main
----------messages:(4/225)----------
command: main KeepAliveStreamCloseWithWrongContentLength
reason: User specified action: run main/othervm/timeout=30 KeepAliveStreamCloseWithWrongContentLength 
Mode: othervm [/othervm specified]
elapsed time (seconds): 0.206
----------configuration:(0/0)----------
----------System.out:(9/153)----------
client reads: 49
client reads: 50
client reads: 51
client reads: 52
client reads: 53
client reads: 54
client reads: 55
client reads: 56
client reads: 57
----------System.err:(25/1821)----------
java.net.SocketException: Connection reset
	at java.base/sun.nio.ch.NioSocketImpl.implRead(NioSocketImpl.java:322)
	at java.base/sun.nio.ch.NioSocketImpl.read(NioSocketImpl.java:347)
	at java.base/sun.nio.ch.NioSocketImpl$1.read(NioSocketImpl.java:800)
	at java.base/java.net.Socket$SocketInputStream.read(Socket.java:966)
	at java.base/java.io.BufferedInputStream.fill(BufferedInputStream.java:244)
	at java.base/java.io.BufferedInputStream.read1(BufferedInputStream.java:284)
	at java.base/java.io.BufferedInputStream.read(BufferedInputStream.java:343)
	at java.base/sun.net.www.MeteredStream.read(MeteredStream.java:141)
	at java.base/java.io.FilterInputStream.read(FilterInputStream.java:132)
	at java.base/sun.net.www.protocol.http.HttpURLConnection$HttpInputStream.read(HttpURLConnection.java:3663)
	at java.base/sun.net.www.protocol.http.HttpURLConnection$HttpInputStream.read(HttpURLConnection.java:3656)
	at java.base/sun.net.www.protocol.http.HttpURLConnection$HttpInputStream.read(HttpURLConnection.java:3644)
	at KeepAliveStreamCloseWithWrongContentLength.main(KeepAliveStreamCloseWithWrongContentLength.java:144)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
	at com.sun.javatest.regtest.agent.MainWrapper$MainThread.run(MainWrapper.java:127)
	at java.base/java.lang.Thread.run(Thread.java:833)

JavaTest Message: Test threw exception: java.net.SocketException: Connection reset
JavaTest Message: shutting down test

STATUS:Failed.`main' threw exception: java.net.SocketException: Connection reset

That would need to be fixed before integrating. IIRC I suggested some changes when we spoke off line some weeks ago. @frkator Did you carry them out?

dfuch · 2021-09-07T09:25:31Z

Thanks for fixing. If you /integrate drop me a note and I will sponsor.

frkator · 2021-09-07T09:35:51Z

thank you @dfuch

frkator · 2021-09-07T09:35:58Z

/integrate

openjdk · 2021-09-07T09:36:58Z

@frkator
Your change (at version 419e3d3) is now ready to be sponsored by a Committer.

dfuch · 2021-09-07T09:45:20Z

/sponsor

openjdk · 2021-09-07T09:46:39Z

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

a522d6b: 8273376: Zero: Disable vtable/itableStub gtests
3cd95a2: 8231356: Fix broken ResourceObj::operator new[] in debug builds
81c719b: 8273333: Zero should warn about unimplemented -XX:+LogTouchedMethods
649c22c: 8270832: Aarch64: Update algorithm annotations for MacroAssembler::fill_words
eb22181: 8273386: Remove duplicated code in G1DCQS::abandon_completed_buffers

Your commit was automatically rebased without conflicts.

openjdk · 2021-09-07T09:46:54Z

@dfuch @frkator Pushed as commit 5caa77b.

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

openjdk bot added the rfr Pull request is ready for review label Jun 11, 2021

openjdk bot added the net net-dev@openjdk.org label Jun 11, 2021

dfuch reviewed Jun 11, 2021

View reviewed changes

test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java Outdated Show resolved Hide resolved

dfuch reviewed Jun 11, 2021

View reviewed changes

test/jdk/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java Outdated Show resolved Hide resolved

dfuch approved these changes Jun 15, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 15, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 15, 2021

frkator added 7 commits July 7, 2021 13:49

JDK-8263364: initial commit

7622650

8263364: fixed headers

7210d65

8263364: refactor

5058b1c

8263364: refactor

955299b

8263364: refactor

48ac753

8263364: removing surplus imports

bdb14e5

8263364: output

a9bae10

frkator force-pushed the JDK-8263364-keep-alive-should-not-throw-null branch from 5a5dc15 to a9bae10 Compare July 7, 2021 12:49

openjdk bot removed the sponsor Pull request is ready to be sponsored label Jul 7, 2021

drain channel impl

478b005

openjdk bot removed the ready Pull request is ready to be integrated label Sep 6, 2021

openjdk bot removed the rfr Pull request is ready for review label Sep 6, 2021

frkator added 2 commits September 6, 2021 18:10

Merge branch 'master' into JDK-8263364-keep-alive-should-not-throw-null

a17ed2f

whitespaces removed

419e3d3

openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 6, 2021

openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 7, 2021

openjdk bot closed this Sep 7, 2021

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 Sep 7, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

frkator commented Jun 11, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jun 11, 2021

openjdk bot commented Jun 11, 2021

mlbridge bot commented Jun 11, 2021 •

edited

Loading

dfuch left a comment

dfuch left a comment

openjdk bot commented Jun 15, 2021 •

edited

Loading

frkator commented Jun 15, 2021

openjdk bot commented Jun 15, 2021

bridgekeeper bot commented Aug 4, 2021

frkator commented Aug 31, 2021

dfuch commented Sep 1, 2021 •

edited

Loading

dfuch commented Sep 2, 2021 •

edited

Loading

dfuch commented Sep 7, 2021

frkator commented Sep 7, 2021

frkator commented Sep 7, 2021

openjdk bot commented Sep 7, 2021

dfuch commented Sep 7, 2021

openjdk bot commented Sep 7, 2021

openjdk bot commented Sep 7, 2021

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

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

Conversation

frkator commented Jun 11, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jun 11, 2021

openjdk bot commented Jun 11, 2021

mlbridge bot commented Jun 11, 2021 • edited Loading

Webrevs

dfuch left a comment

Choose a reason for hiding this comment

dfuch left a comment

Choose a reason for hiding this comment

openjdk bot commented Jun 15, 2021 • edited Loading

frkator commented Jun 15, 2021

openjdk bot commented Jun 15, 2021

bridgekeeper bot commented Aug 4, 2021

frkator commented Aug 31, 2021

dfuch commented Sep 1, 2021 • edited Loading

dfuch commented Sep 2, 2021 • edited Loading

dfuch commented Sep 7, 2021

frkator commented Sep 7, 2021

frkator commented Sep 7, 2021

openjdk bot commented Sep 7, 2021

dfuch commented Sep 7, 2021

openjdk bot commented Sep 7, 2021

openjdk bot commented Sep 7, 2021

frkator commented Jun 11, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 11, 2021 •

edited

Loading

openjdk bot commented Jun 15, 2021 •

edited

Loading

dfuch commented Sep 1, 2021 •

edited

Loading

dfuch commented Sep 2, 2021 •

edited

Loading