[jdk8u-dev] RFR: 8231111: Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy [v5]

Jonathan Dowland jdowland at openjdk.org
Fri Nov 4 10:00:29 UTC 2022


> This is a backport of [4def210a22faaec6b47912dd314e6365ea48d28f](https://github.com/openjdk/jdk/commit/4def210a22faaec6b47912dd314e6365ea48d28f) for jdk8u-dev as part of an effort to backport cgroups v2 support.
> 
> It does not apply clean. Paths need unshuffling. A number of changes were needed for 8u support. I've structured the PR as separate commits, with each change made in a separate commit for (hopefully) ease of review.
> 
> Not all the new tests pass:     TestDockerMemoryMetrics  failing one, specifically:
> 
>     Exception in thread "main" java.lang.RuntimeException: Memory and swap limit not equal, expected : [209715200, 1073741824], got : [209715200, 864026624]
> 
> I think this is fixed in a further patch to backport, and will confirm.

Jonathan Dowland has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 21 additional commits since the last revision:

 - Merge remote-tracking branch 'jdk8u-dev/master' into 8231111-jdk8u-dev
 - 8295950: Enable langtools/tier1 in GHA for 8u
   
   Reviewed-by: sgehwolf
 - 8295173: (tz) Update Timezone Data to 2022e
   
   Reviewed-by: sgehwolf
   Backport-of: 21407dec0156301871a83328615e4d975c4287c4
 - 8294357: (tz) Update Timezone Data to 2022d
   
   Reviewed-by: sgehwolf
   Backport-of: f67b4de8a07b8158be1dfb5b09cdb4cc5b7ac93b
 - Address style nit
 - TestCgroupSubsystemController: rework use of Files.writeString
 - CgroupSubsystemController: fix library paths
   
   We need the testlibrary copy of FileUtils but the test.lib.util copy of
   Utils (method createTempDirectory is missing from the testlib copy)
 - TestCgroupSubsystemController: fix jtreg @library path
 - Replace Arrays.compare with Arrays.equals
   
   jdk8u does not have Arrays.compare()
 - incorporate (part of) 8275713: TestDockerMemoryMetrics test fails on recent runc
   
   The main hunk from 8275713 was rolled up in the changes for 8231111.
   This line is also necessary.
 - ... and 11 more: https://git.openjdk.org/jdk8u-dev/compare/76192af6...f56af77f

-------------

Changes:
  - all: https://git.openjdk.org/jdk8u-dev/pull/121/files
  - new: https://git.openjdk.org/jdk8u-dev/pull/121/files/d0352fcf..f56af77f

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk8u-dev&pr=121&range=04
 - incr: https://webrevs.openjdk.org/?repo=jdk8u-dev&pr=121&range=03-04

  Stats: 5213 lines in 67 files changed: 2762 ins; 1757 del; 694 mod
  Patch: https://git.openjdk.org/jdk8u-dev/pull/121.diff
  Fetch: git fetch https://git.openjdk.org/jdk8u-dev pull/121/head:pull/121

PR: https://git.openjdk.org/jdk8u-dev/pull/121


More information about the jdk8u-dev mailing list