[geode] branch develop updated: GEODE-10197: fix test for jdk17

[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 d54083c7d7 GEODE-10197: fix test for jdk17
d54083c7d7 is described below

commit d54083c7d7b0d14631df262964ef071599660666
Author: Darrel Schneider <dar...@vmware.com>
AuthorDate: Fri Apr 15 23:41:32 2022 -0700

    GEODE-10197: fix test for jdk17
    
    OutOfMemoryDUnitTest now only uses CMS on jdk less than 14. (#7595)
---
 .../java/org/apache/geode/redis/OutOfMemoryDUnitTest.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 5c49948dbd..a1a81e89ea 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
@@ -15,6 +15,8 @@
 
 package org.apache.geode.redis;
 
+import static org.apache.commons.lang3.JavaVersion.JAVA_13;
+import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
 import static 
org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static 
org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR;
 import static 
org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__DIR;
@@ -143,8 +145,10 @@ public class OutOfMemoryDUnitTest {
         .addOption(START_SERVER__INITIAL_HEAP, "125m")
         .addOption(START_SERVER__MAXHEAP, "125m")
         .addOption(START_SERVER__CRITICAL__HEAP__PERCENTAGE, "50")
-        .addOption(START_SERVER__J, "-XX:CMSInitiatingOccupancyFraction=45")
         .addOption(START_SERVER__CLASSPATH, redisHome.getGeodeForRedisHome() + 
"/lib/*");
+    if (isJavaVersionAtMost(JAVA_13)) {
+      startServerCommand.addOption(START_SERVER__J, 
"-XX:CMSInitiatingOccupancyFraction=45");
+    }
     
gfsh.executeAndAssertThat(startServerCommand.getCommandString()).statusIsSuccess();
   }