This repository has been archived by the owner on Feb 2, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8250627: Use -XX:+/-UseContainerSupport for enabling/disabling Java c…
…ontainer metrics Backport-of: e6517d1ae2628f16442e09fd8f48190762517d2e
- Loading branch information
Ekaterina Vergizova
committed
May 11, 2021
1 parent
f0f89d2
commit ca0a09e
Showing
7 changed files
with
175 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ | |
# | ||
|
||
JVM_handle_linux_signal | ||
JVM_IsUseContainerSupport | ||
numa_error | ||
numa_warn | ||
sysThreadAvailableStackWithSlack |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* Copyright (c) 2020, Red Hat, Inc. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. Oracle designates this | ||
* particular file as subject to the "Classpath" exception as provided | ||
* by Oracle in the LICENSE file that accompanied this code. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
#include "jni.h" | ||
#include "jvm.h" | ||
|
||
#include "jdk_internal_platform_CgroupMetrics.h" | ||
|
||
JNIEXPORT jboolean JNICALL | ||
Java_jdk_internal_platform_CgroupMetrics_isUseContainerSupport(JNIEnv *env, jclass ignored) | ||
{ | ||
return JVM_IsUseContainerSupport(); | ||
} |
46 changes: 46 additions & 0 deletions
46
test/jdk/jdk/internal/platform/docker/CheckUseContainerSupport.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Copyright (c) 2020, Red Hat, Inc. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
import jdk.internal.platform.Metrics; | ||
|
||
public class CheckUseContainerSupport { | ||
|
||
// Usage: boolean value of -XX:+/-UseContainerSupport | ||
// passed as the only argument | ||
public static void main(String[] args) throws Exception { | ||
if (args.length != 1) { | ||
throw new RuntimeException("Expected only one boolean argument"); | ||
} | ||
boolean expectedContainerSupport = Boolean.parseBoolean(args[0]); | ||
boolean actualContainerSupport = (Metrics.systemMetrics() != null); | ||
if (expectedContainerSupport != actualContainerSupport) { | ||
String msg = "-XX:" + ( expectedContainerSupport ? "+" : "-") + "UseContainerSupport, but got " + | ||
"Metrics.systemMetrics() == " + (Metrics.systemMetrics() == null ? "null" : "non-null"); | ||
System.out.println(msg); | ||
System.out.println("TEST FAILED!!!"); | ||
return; | ||
} | ||
System.out.println("TEST PASSED!!!"); | ||
} | ||
|
||
} |
74 changes: 74 additions & 0 deletions
74
test/jdk/jdk/internal/platform/docker/TestUseContainerSupport.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* | ||
* Copyright (c) 2020, Red Hat, Inc. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
/* | ||
* @test | ||
* @summary UseContainerSupport flag should reflect Metrics being available | ||
* @requires docker.support | ||
* @library /test/lib | ||
* @modules java.base/jdk.internal.platform | ||
* @build CheckUseContainerSupport | ||
* @run main/timeout=360 TestUseContainerSupport | ||
*/ | ||
|
||
import jdk.test.lib.Utils; | ||
import jdk.test.lib.containers.docker.Common; | ||
import jdk.test.lib.containers.docker.DockerRunOptions; | ||
import jdk.test.lib.containers.docker.DockerTestUtils; | ||
|
||
public class TestUseContainerSupport { | ||
private static final String imageName = Common.imageName("useContainerSupport"); | ||
|
||
public static void main(String[] args) throws Exception { | ||
if (!DockerTestUtils.canTestDocker()) { | ||
return; | ||
} | ||
|
||
DockerTestUtils.buildJdkDockerImage(imageName, "Dockerfile-BasicTest", "jdk-docker"); | ||
|
||
try { | ||
testUseContainerSupport(true); | ||
testUseContainerSupport(false); | ||
} finally { | ||
DockerTestUtils.removeDockerImage(imageName); | ||
} | ||
} | ||
|
||
private static void testUseContainerSupport(boolean useContainerSupport) throws Exception { | ||
String testMsg = " with -XX:" + (useContainerSupport ? "+" : "-") + "UseContainerSupport"; | ||
Common.logNewTestCase("Test TestUseContainerSupport" + testMsg); | ||
DockerRunOptions opts = | ||
new DockerRunOptions(imageName, "/jdk/bin/java", "CheckUseContainerSupport"); | ||
opts.addClassOptions(Boolean.valueOf(useContainerSupport).toString()); | ||
opts.addDockerOpts("--memory", "200m") | ||
.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/"); | ||
if (useContainerSupport) { | ||
opts.addJavaOpts("-XX:+UseContainerSupport"); | ||
} else { | ||
opts.addJavaOpts("-XX:-UseContainerSupport"); | ||
} | ||
opts.addJavaOpts("-cp", "/test-classes/"); | ||
opts.addJavaOpts("--add-exports", "java.base/jdk.internal.platform=ALL-UNNAMED"); | ||
DockerTestUtils.dockerRunJava(opts).shouldHaveExitValue(0).shouldContain("TEST PASSED!!!"); | ||
} | ||
} |
ca0a09e
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues