Skip to content

Conversation

sercher
Copy link
Contributor

@sercher sercher commented Sep 29, 2025

This is a clean backport of JDK-8354475, a follow up fix for JDK-8343191 (#2278)

This PR depends on and can be integrated after #2280


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8354475 needs maintainer approval

Issue

  • JDK-8354475: TestDockerMemoryMetricsSubgroup.java fails with exitValue = 1 (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2282

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 29, 2025

👋 Welcome back schernyshev! A progress list of the required criteria for merging this PR into pr/2280 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Sep 29, 2025

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

8354475: TestDockerMemoryMetricsSubgroup.java fails with exitValue = 1

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 11 new commits pushed to 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.

➡️ 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 changed the title Backport e579cca619147aa51563dc00f374e02db49e1238 8354475: TestDockerMemoryMetricsSubgroup.java fails with exitValue = 1 Sep 29, 2025
@openjdk
Copy link

openjdk bot commented Sep 29, 2025

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Sep 29, 2025
@sercher sercher marked this pull request as ready for review September 29, 2025 22:45
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 29, 2025
@mlbridge
Copy link

mlbridge bot commented Sep 29, 2025

Webrevs

@sercher
Copy link
Contributor Author

sercher commented Sep 30, 2025

/approval request Direct follow up for 8343191, that improves container detection. The fix skips the test in rootles setups.

@openjdk
Copy link

openjdk bot commented Sep 30, 2025

@sercher
8354475: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Sep 30, 2025
@openjdk openjdk bot removed the approval Requires approval; will be removed when approval is received label Oct 7, 2025
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/2280 to master October 10, 2025 08:25
@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-e579cca619147aa51563dc00f374e02db49e1238
git fetch https://git.openjdk.org/jdk21u-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 openjdk bot removed the clean Identical backport; no merge resolution required label Oct 10, 2025
@openjdk
Copy link

openjdk bot commented Oct 10, 2025

@sercher 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-e579cca619147aa51563dc00f374e02db49e1238
git fetch https://git.openjdk.org/jdk21u-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 Oct 10, 2025
@openjdk openjdk bot added clean Identical backport; no merge resolution required ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Oct 10, 2025
@sercher
Copy link
Contributor Author

sercher commented Oct 10, 2025

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 10, 2025
@openjdk
Copy link

openjdk bot commented Oct 10, 2025

@sercher
Your change (at version 0aa5048) is now ready to be sponsored by a Committer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored

Development

Successfully merging this pull request may close these issues.

3 participants