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

8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist #1379

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link

@jmtd jmtd commented Sep 29, 2022

I'd like to backport this to jdk11u-dev. It fixes a test failure caused due to expected cgroups virtual files (nr_quota etc) not existing in some circumstances/some systems. The patch cherry picks clean, touches one test library file, which is exercised by running ./test/jdk/jdk/internal/platform/cgroup/TestCgroupMetrics.java, which fails in current 11u-dev and passes after this patch.


Progress

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

Issue

  • JDK-8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1379

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 29, 2022

👋 Welcome back jdowland! 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 Backport 444a0d98ac06ab043e3b11281234fd515abff302 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist Sep 29, 2022
@openjdk
Copy link

openjdk bot commented Sep 29, 2022

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

@openjdk
Copy link

openjdk bot commented Sep 29, 2022

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

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

8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist

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 rfr Pull request is ready for review labels Sep 29, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 29, 2022

Webrevs

@jmtd
Copy link
Author

jmtd commented Sep 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 29, 2022

Going to push as commit 378b516.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 5944581: 8285836: sun/net/www/http/KeepAliveCache/KeepAliveProperty.java failed with "RuntimeException: Failed in server"

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 29, 2022

@jmtd Pushed as commit 378b516.

💡 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 clean integrated Pull request has been integrated
1 participant