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

8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction #1662

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 14, 2023

Semi-clean follow-up backport to relax the test.

There are no ProblemList additions in 17u, so this changeset does not have the relevant hunk.

Additional testing:

  • Linux x86_64 fastdebug, affected test

Progress

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

Issue

  • JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1662

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 14, 2023

👋 Welcome back shade! A progress list of the required criteria for merging this PR into pr/1616 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 ad34be1f329edc8e7155983835cc70d733c014b8 8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction Aug 14, 2023
@openjdk
Copy link

openjdk bot commented Aug 14, 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 Aug 14, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 14, 2023

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1616 to master August 25, 2023 13:23
@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 JDK-8312525-trim-native-test-2
git fetch https://git.openjdk.org/jdk17u-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 Aug 25, 2023

@shipilev 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 JDK-8312525-trim-native-test-2
git fetch https://git.openjdk.org/jdk17u-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 openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Aug 25, 2023
@shipilev shipilev force-pushed the JDK-8312525-trim-native-test-2 branch from 20e6716 to 463ffc6 Compare August 25, 2023 13:27
@openjdk
Copy link

openjdk bot commented Aug 25, 2023

@shipilev Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Aug 25, 2023

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

8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction

Reviewed-by: mdoerr

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 Aug 25, 2023
@shipilev
Copy link
Member Author

Testing was clean before rebase. Local testing passes. Review is here. Push approval granted.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 25, 2023

Going to push as commit 3c426c7.

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

openjdk bot commented Aug 25, 2023

@shipilev Pushed as commit 3c426c7.

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

@shipilev shipilev deleted the JDK-8312525-trim-native-test-2 branch December 11, 2023 10:32
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