Exclude OperatingSystemMXBean PhysicalMemory test in Docker #12420
Conversation
|
I'll add plinux. |
|
Even better would be to detect the VM is running in docker, not sure how to do that. |
test/functional/JLM_Tests/src/org/openj9/test/management/TestOperatingSystemMXBean.java
Outdated
Show resolved
Hide resolved
pshipton
force-pushed
the
excludeosbean
branch
4 times, most recently
from
9c2f4ff
to
18501cb
Compare
pshipton
changed the title
|
Updated to detect when running in a Docker container on Linux rather than checking for hard coded platforms. Tested via grinders, which don't detect a container as expected on the OpenJ9 machines. Added an enum in the code, run one more grinder to validate. |
| try (FileInputStream env = new FileInputStream("/.dockerenv")) { | ||
| logger.info("/.dockerenv found"); | ||
| inContainer = ContainerStatus.FOUND; | ||
| return true; | ||
| } catch (IOException e) { | ||
| // no "/.dockerenv" file, fall through | ||
| } |
There was a problem hiding this comment.
This can be simplified to if (new File("/.dockerenv").exists()) { ...}.
| String line; | ||
| while ((line = reader.readLine()) != null) { | ||
| if (line.contains("docker")) { |
There was a problem hiding this comment.
Suggested simplification:
if (reader.lines().anyMatch(line -> line.contains("docker"))) {
logger.info("Container found: " + line);
inContainer = ContainerStatus.FOUND;
return true;
}
There was a problem hiding this comment.
It doesn't work because line is used afterwards to log how the container was found, for easier debugging.
There was a problem hiding this comment.
I missed that aspect. It could probably be reworked, but perhaps it's not worth it.
There was a problem hiding this comment.
Updated it to use your pattern.
There was a problem hiding this comment.
The lambda need not change if you use findFirst():
Optional<String> docker = reader.lines().filter(line -> line.contains("docker")).findFirst();
if (docker.isPresent()) {
logger.info("Container found: " + docker.get());
inContainer = ContainerStatus.FOUND;
return true;
}
test/functional/JLM_Tests/src/org/openj9/test/management/TestOperatingSystemMXBean.java
Show resolved
Hide resolved
pshipton
force-pushed
the
excludeosbean
branch
3 times, most recently
from
be3f2e1
to
2fbbaad
Compare
|
Updated to address comments. New grinder https://ci.eclipse.org/openj9/view/Test/job/Grinder/1682 - passed. |
pshipton
force-pushed
the
excludeosbean
branch
2 times, most recently
from
09b1718
to
59067d5
Compare
|
@pshipton just tried fix out at Adopt, and works greate on xLinux, pLinux and aarch64 docker nodes: It would be useful to have this in the release branch if possible for next week so we avoid unnecessary test triage noise... |
pshipton
force-pushed
the
excludeosbean
branch
2 times, most recently
from
2030679
to
ca1f687
Compare
Part of tests testOSMXBeanLocal and testOSMXBeanRemote, which run org.openj9.test.management.TestOperatingSystemMXBean.runTestOSMXBean() Issue eclipse-openj9#12038 Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
|
New grinder https://ci.eclipse.org/openj9/view/Test/job/Grinder/1686 - passed. |
Part of tests testOSMXBeanLocal and testOSMXBeanRemote, which run
org.openj9.test.management.TestOperatingSystemMXBean.runTestOSMXBean()
Issue #12038