RFR: 8261242: [Linux] OSContainer::is_containerized() returns true when run outside a container [v7]
Laurence Cable
larry.cable at oracle.com
Fri Jun 28 18:02:27 UTC 2024
On 6/28/24 8:45 AM, Severin Gehwolf wrote:
> On Thu, 27 Jun 2024 18:40:09 GMT, Larry Cable <duke at openjdk.org> wrote:
>
>>> Severin Gehwolf has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 17 commits:
>>>
>>> - Refactor mount info matching to helper function
>>> - Merge branch 'master' into jdk-8261242-is-containerized-fix
>>> - Remove problem listing of PlainRead which is reworked here
>>> - Merge branch 'master' into jdk-8261242-is-containerized-fix
>>> - Merge branch 'master' into jdk-8261242-is-containerized-fix
>>> - Add doc for mountinfo scanning.
>>> - Unify naming of variables
>>> - Merge branch 'master' into jdk-8261242-is-containerized-fix
>>> - Merge branch 'master' into jdk-8261242-is-containerized-fix
>>> - jcheck fixes
>>> - ... and 7 more: https://git.openjdk.org/jdk/compare/baafa662...532ea33b
>> src/hotspot/share/prims/jvm.cpp line 504:
>>
>>> 502: JVM_LEAF(jboolean, JVM_IsContainerized(void))
>>> 503: #ifdef LINUX
>>> 504: if (OSContainer::is_containerized()) {
>> // nit: personal preference...
>>
>> return OSContainer::isContainerized() ? JNI_TRUE : JNI_FALSE;
> I've kept this as is, since the suggestion generates this code after preprocessing on Linux:
>
>
> return OSContainer::is_containerized() ? JNI_TRUE : JNI_FALSE;
> return JNI_FALSE;
>
>
> over the existing version:
>
>
> if (OSContainer::is_containerized()) {
> return JNI_TRUE;
> }
> return JNI_FALSE;
Uugh ... makes sense (I guess) :)
> -------------
>
> PR Review Comment: https://git.openjdk.org/jdk/pull/18201#discussion_r1658938198
More information about the serviceability-dev
mailing list