From d3073b53d34c47976191acaa0d07cd1d919f3251 Mon Sep 17 00:00:00 2001 From: William Kemper Date: Sat, 30 May 2026 02:08:31 +0000 Subject: [PATCH] 8385610: Shenandoah: TestSoftMaxHeapSizeAvailableCalc should have more tolerance for other GC triggers Reviewed-by: kdnilsen, xpeng, syan, ruili --- .../gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java b/test/hotspot/jtreg/gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java index e70f2f0849f..100666fe859 100644 --- a/test/hotspot/jtreg/gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java +++ b/test/hotspot/jtreg/gc/shenandoah/TestSoftMaxHeapSizeAvailableCalc.java @@ -35,6 +35,7 @@ * -XX:ShenandoahGCMode=satb * -XX:+ShenandoahDegeneratedGC * -XX:ShenandoahGCHeuristics=adaptive + * -XX:ShenandoahLearningSteps=0 * TestSoftMaxHeapSizeAvailableCalc */ @@ -60,6 +61,7 @@ * -XX:+UseShenandoahGC -Xlog:gc=info * -XX:ShenandoahGCMode=generational * -XX:ShenandoahGCHeuristics=adaptive + * -XX:ShenandoahLearningSteps=0 * TestSoftMaxHeapSizeAvailableCalc * */ @@ -87,12 +89,13 @@ public class TestSoftMaxHeapSizeAvailableCalc { // Soft max: 512M, ShenandoahMinFreeThreshold: 10 (default), ShenandoahEvacReserve: 5 (default) // Soft max for mutator: 512M * (100.0 - 5) / 100 = 486.4M // Threshold to trigger gc: 486.4M - 512 * 10 / 100.0 = 435.2M, just above (300 + 100)M. - // Expect gc count to be less than 1 / sec. + // Expect gc count to be less than 1 / sec, but to allow for other trigger conditions (like allocation rate), + // we bump the max allowed gc count to 35. public static class Allocate { static final List longLived = new ArrayList<>(); public static void test() throws Exception { - final int expectedMaxGcCount = Integer.getInteger("expectedMaxGcCount", 30); + final int expectedMaxGcCount = Integer.getInteger("expectedMaxGcCount", 35); List collectors = ManagementFactory.getGarbageCollectorMXBeans(); java.lang.management.GarbageCollectorMXBean cycleCollector = null; for (java.lang.management.GarbageCollectorMXBean bean : collectors) {