From b25e9c0f50c2398f90c27b807cc0d255667fb1d7 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 8 Jan 2024 22:10:57 +0100 Subject: [PATCH 1/4] Addresses JBS issue 8309218 but pinning OOMEInAQS to always run on G1 --- test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java b/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java index f8bb222fb98ef..37024750e4ea8 100644 --- a/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java +++ b/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java @@ -38,7 +38,8 @@ * @test * @bug 8066859 * @summary Check that AQS-based locks, conditions, and CountDownLatches do not fail when encountering OOME - * @run main/othervm -XX:-UseGCOverheadLimit -Xmx48M -XX:-UseTLAB OOMEInAQS + * @requires vm.gc.G1 + * @run main/othervm -XX:+UseG1GC -XX:-UseGCOverheadLimit -Xmx48M -XX:-UseTLAB OOMEInAQS */ public class OOMEInAQS extends Thread { From b28ae0a9a01611811d9340cd17101fa595cfe715 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 8 Jan 2024 22:12:58 +0100 Subject: [PATCH 2/4] Updating copyright year for OOMEInAQS.java --- test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java b/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java index 37024750e4ea8..5a78d2791fe6d 100644 --- a/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java +++ b/test/jdk/java/util/concurrent/locks/Lock/OOMEInAQS.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it From 50848a799e7d820277aef9ce042994938aa41fd7 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 9 Jan 2024 11:59:49 +0100 Subject: [PATCH 3/4] Removing OOMEInAQS from zgc and zgc-gen problem lists --- test/jdk/ProblemList-generational-zgc.txt | 1 - test/jdk/ProblemList-zgc.txt | 2 -- 2 files changed, 3 deletions(-) diff --git a/test/jdk/ProblemList-generational-zgc.txt b/test/jdk/ProblemList-generational-zgc.txt index d6a6f63c6a5e8..6b7e67364bea5 100644 --- a/test/jdk/ProblemList-generational-zgc.txt +++ b/test/jdk/ProblemList-generational-zgc.txt @@ -38,4 +38,3 @@ sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java 8307393 generic-all sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8307393 generic-all com/sun/jdi/ThreadMemoryLeakTest.java 8307402 generic-all -java/util/concurrent/locks/Lock/OOMEInAQS.java 8309218 generic-all diff --git a/test/jdk/ProblemList-zgc.txt b/test/jdk/ProblemList-zgc.txt index df7edd2cf7d08..9aa1c64ed4c46 100644 --- a/test/jdk/ProblemList-zgc.txt +++ b/test/jdk/ProblemList-zgc.txt @@ -27,7 +27,5 @@ # ############################################################################# -java/util/concurrent/locks/Lock/OOMEInAQS.java 8309218 generic-all - sun/tools/jhsdb/JShellHeapDumpTest.java 8276539 generic-all sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8276539 generic-all From 266c5c5c69f03b770c16217e754d163f1112e5e4 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 9 Jan 2024 12:04:30 +0100 Subject: [PATCH 4/4] Updating copyright year for zgc and zgc-gen problem lists --- test/jdk/ProblemList-generational-zgc.txt | 2 +- test/jdk/ProblemList-zgc.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/jdk/ProblemList-generational-zgc.txt b/test/jdk/ProblemList-generational-zgc.txt index 6b7e67364bea5..9fa9874d20c64 100644 --- a/test/jdk/ProblemList-generational-zgc.txt +++ b/test/jdk/ProblemList-generational-zgc.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff --git a/test/jdk/ProblemList-zgc.txt b/test/jdk/ProblemList-zgc.txt index 9aa1c64ed4c46..9fae070e25d1f 100644 --- a/test/jdk/ProblemList-zgc.txt +++ b/test/jdk/ProblemList-zgc.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it