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

8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head #64

Closed
wants to merge 1 commit into from

Conversation

yan-too
Copy link
Contributor

@yan-too yan-too commented May 23, 2022

I need to backport this fix prepared by Christoph Langer to jdk8u, too. Without it, further backports using Token would be painful. The fix is not technically a backport from upstream for obvious reason so it would require review etc.


Progress

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

Issue

  • JDK-8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk8u-dev pull/64/head:pull/64
$ git checkout pull/64

Update a local copy of the PR:
$ git checkout pull/64
$ git pull https://git.openjdk.java.net/jdk8u-dev pull/64/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 64

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk8u-dev/pull/64.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 23, 2022

👋 Welcome back yan! 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 8285727: [11u, 17u] Unify fix for JDK-8284920 with version 8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head May 23, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label May 23, 2022
@mlbridge
Copy link

mlbridge bot commented May 23, 2022

Webrevs

@jerboaa
Copy link
Contributor

jerboaa commented May 23, 2022

@yan-too Could you please change the PR title to Backport a95482acf83cc03bc562baace0d55d831d0b2b41 as it's really a backport of that change in JDK 17 (modulo path changes). Right now the bot complains about the issue not being open.

@yan-too
Copy link
Contributor Author

yan-too commented May 24, 2022

@jerboaa Actually that complain is quite common thing because 8285727 indeed is not open: it is Resolved/Fixed. I will change the title but I'm afraid there might be a problem in future since a95482acf83cc03bc562baace0d55d831d0b2b41 is not in head as would be usual for the regular fixes (not backports) in 17. History of it stops in 17. Let's see though... it works! openjdk bot says "...with version from head" but has found the hash in 17u. Openjdk looks like hydra :-)

@yan-too yan-too changed the title 8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head Backport a95482acf83cc03bc562baace0d55d831d0b2b41 May 24, 2022
@openjdk openjdk bot changed the title Backport a95482acf83cc03bc562baace0d55d831d0b2b41 8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head May 24, 2022
@openjdk
Copy link

openjdk bot commented May 24, 2022

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

@openjdk openjdk bot added the backport label May 24, 2022
@jerboaa
Copy link
Contributor

jerboaa commented May 24, 2022

@jerboaa Actually that complain is quite common thing because 8285727 indeed is not open: it is Resolved/Fixed. I will change the title but I'm afraid there might be a problem in future since a95482acf83cc03bc562baace0d55d831d0b2b41 is not in head as would be usual for the regular fixes (not backports) in 17. History of it stops in 17. Let's see though... it works! openjdk bot says "...with version from head" but has found the hash in 17u. Openjdk looks like hydra :-)

Thanks! Yeah, the original change was in 17 and downward, but it's still a backport of the JDK 17 unification change. jdk head got the same change with JDK-8284920.

@jerboaa
Copy link
Contributor

jerboaa commented May 24, 2022

This is a clean backport modulo path changes. Trying to mark as such.

@jerboaa
Copy link
Contributor

jerboaa commented May 24, 2022

/clean

@openjdk openjdk bot added the clean label May 24, 2022
@openjdk
Copy link

openjdk bot commented May 24, 2022

@jerboaa This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented May 24, 2022

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

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

8285727: [11u, 17u] Unify fix for JDK-8284920 with version from head

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 1 new commit pushed to the master branch:

  • db52470: 8285523: Improve test java/io/FileOutputStream/OpenNUL.java

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 added the ready Pull request is ready to be integrated label May 24, 2022
@yan-too
Copy link
Contributor Author

yan-too commented May 24, 2022

Thank you, @jerboaa! This trick with forced clean also works (I tried it several times before with different results).

@yan-too
Copy link
Contributor Author

yan-too commented May 24, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 24, 2022

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

  • eb5711b: 8284620: CodeBuffer may leak _overflow_arena
  • db52470: 8285523: Improve test java/io/FileOutputStream/OpenNUL.java

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 24, 2022

@yan-too Pushed as commit 7961755.

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

@yan-too yan-too deleted the bp8285727 branch May 30, 2022 10:08
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
3 participants