[geode] branch develop updated: GEODE-10246: fix OutOfMemoryDUnitTest for jdk17 (#7606)

[dschneider]

This is an automated email from the ASF dual-hosted git repository.

dschneider pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 89a6112844 GEODE-10246: fix OutOfMemoryDUnitTest for jdk17 (#7606)
89a6112844 is described below

commit 89a6112844fdc07e85aa11ed67cbb1808b09569e
Author: Darrel Schneider <dar...@vmware.com>
AuthorDate: Tue Apr 19 19:26:02 2022 -0700

    GEODE-10246: fix OutOfMemoryDUnitTest for jdk17 (#7606)
    
    * test now uses ZGC  on jdk17
    * product change: added ZHeap to the list of known memoryPoolMXBeans
---
 .../java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java | 1 +
 .../java/org/apache/geode/redis/OutOfMemoryDUnitTest.java               | 2 ++
 2 files changed, 3 insertions(+)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
index ddfbdb7342..c6aa2ab3c5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
@@ -175,6 +175,7 @@ public class HeapMemoryMonitor implements 
NotificationListener, MemoryMonitor {
         || name.equals("Tenured Gen") // Hitachi 1.5 GC
         || name.equals("Java heap") // IBM 1.5, 1.6 GC
         || name.equals("GenPauseless Old Gen") // azul C4/GPGC collector
+        || name.equals("ZHeap") // ZGC
 
         // Allow an unknown pool name to monitor
         || (HEAP_POOL != null && name.equals(HEAP_POOL));
diff --git 
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java
 
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java
index a1a81e89ea..47307d734f 100644
--- 
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java
+++ 
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/OutOfMemoryDUnitTest.java
@@ -148,6 +148,8 @@ public class OutOfMemoryDUnitTest {
         .addOption(START_SERVER__CLASSPATH, redisHome.getGeodeForRedisHome() + 
"/lib/*");
     if (isJavaVersionAtMost(JAVA_13)) {
       startServerCommand.addOption(START_SERVER__J, 
"-XX:CMSInitiatingOccupancyFraction=45");
+    } else {
+      startServerCommand.addOption(START_SERVER__J, "-XX:+UseZGC");
     }
     
gfsh.executeAndAssertThat(startServerCommand.getCommandString()).statusIsSuccess();
   }