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

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #2287

Closed
wants to merge 14 commits into from

Conversation

phohensee
Copy link
Member

@phohensee phohensee commented Nov 21, 2023

Follow-on bug fix for JDK-8304074 backport. Clean backport from 17u, see openjdk/jdk17u-dev#1981. The lock definition macro changed between 17 and 21, so the definition of MonitoringSupport_lock is different.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • JDK-8313081 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2287/head:pull/2287
$ git checkout pull/2287

Update a local copy of the PR:
$ git checkout pull/2287
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2287/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2287

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2287.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 21, 2023

👋 Welcome back phh! A progress list of the required criteria for merging this PR into pr/2286 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 a9d21c61fb12a11e18c6bb8aa903e5a8e42473f1 8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 Nov 21, 2023
@openjdk
Copy link

openjdk bot commented Nov 21, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 21, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 21, 2023

Webrevs

Copy link
Member

@simonis simonis left a comment

Choose a reason for hiding this comment

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

Looks good but see my inline comments.

@phohensee
Copy link
Member Author

/approval request Almost clean backport of a follow-on fix for the JDK-8304074 backport at #2286. In production at Amazon for over two months.

@openjdk
Copy link

openjdk bot commented Dec 6, 2023

@phohensee
8313081: The approval request has been created successfully.

@openjdk openjdk bot added approval and removed approval labels Dec 6, 2023
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/2286 to master December 7, 2023 16:22
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout backport-8313081
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Dec 7, 2023

⚠️ @phohensee This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk
Copy link

openjdk bot commented Dec 7, 2023

@phohensee this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout backport-8313081
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Dec 7, 2023

⚠️ @phohensee This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 7, 2023
@openjdk
Copy link

openjdk bot commented Dec 7, 2023

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

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

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074

Reviewed-by: simonis

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Dec 7, 2023
@phohensee
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 7, 2023

Going to push as commit 3ea286a.

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

openjdk bot commented Dec 7, 2023

@phohensee Pushed as commit 3ea286a.

💡 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 integrated Pull request has been integrated
2 participants