From f3ea5b727fc270fdc8d1b3dea0f67827daf755ca Mon Sep 17 00:00:00 2001 From: Simon Rushton Date: Tue, 18 Aug 2020 11:47:19 +0100 Subject: [PATCH] Adjust jlm load parameters Signed-off-by: Simon Rushton --- .../net/adoptopenjdk/test/jlm/TestJlmRemoteClassAuth.java | 4 +++- .../net/adoptopenjdk/test/jlm/TestJlmRemoteClassNoAuth.java | 4 +++- .../net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryAuth.java | 4 +++- .../net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryNoAuth.java | 4 +++- .../adoptopenjdk/test/jlm/TestJlmRemoteNotifierProxyAuth.java | 4 +++- .../net/adoptopenjdk/test/jlm/TestJlmRemoteThreadAuth.java | 4 +++- .../net/adoptopenjdk/test/jlm/TestJlmRemoteThreadNoAuth.java | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassAuth.java b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassAuth.java index 0956d8dd..c6a59589 100644 --- a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassAuth.java +++ b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassAuth.java @@ -75,6 +75,8 @@ public void execute(StfCoreExtension test) throws StfException { // Process definition for the monitored server JVM String inventoryFile = "/openjdk.test.load/config/inventories/mix/mini-mix.xml"; + // setSuiteNumTests and setSuiteThreadCount need to be big enough to ensure the workload does not + // end within the setTimeLimit time. LoadTestProcessDefinition serverLoadTestInvocation = test.createLoadTestSpecification() .addJvmOption("-Xmx256m") .addJvmOption("-Dcom.sun.management.jmxremote.port=1234") @@ -94,7 +96,7 @@ public void execute(StfCoreExtension test) throws StfException { .setTimeLimit("30m") .setAbortAtFailureLimit(-1) .addSuite("mini-mix") - .setSuiteNumTests(900000) + .setSuiteNumTests(20000000) .setSuiteInventory(inventoryFile) .setSuiteThreadCount(30) .setSuiteRandomSelection(); diff --git a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassNoAuth.java b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassNoAuth.java index e1d8112e..9a349fe6 100644 --- a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassNoAuth.java +++ b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteClassNoAuth.java @@ -67,6 +67,8 @@ public void execute(StfCoreExtension test) throws StfException { // Process definition for the server JVM String inventoryFile = "/openjdk.test.load/config/inventories/mix/mini-mix.xml"; + // setSuiteNumTests and setSuiteThreadCount need to be big enough to ensure the workload does not + // end within the setTimeLimit time. LoadTestProcessDefinition serverLoadTestInvocation = test.createLoadTestSpecification() .addJvmOption("-Xmx256m") .addJvmOption("-Dcom.sun.management.jmxremote.port=1234") @@ -80,7 +82,7 @@ public void execute(StfCoreExtension test) throws StfException { .setTimeLimit("30m") .setAbortAtFailureLimit(-1) .addSuite("mini-mix") - .setSuiteNumTests(900000) + .setSuiteNumTests(20000000) .setSuiteInventory(inventoryFile) .setSuiteThreadCount(30) .setSuiteRandomSelection(); diff --git a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryAuth.java b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryAuth.java index e69c2f7b..cc95518c 100644 --- a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryAuth.java +++ b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryAuth.java @@ -75,6 +75,8 @@ public void execute(StfCoreExtension test) throws StfException { // Process definition for the monitored server JVM String inventoryFile = "/openjdk.test.load/config/inventories/mix/mini-mix.xml"; + // setSuiteNumTests and setSuiteThreadCount need to be big enough to ensure the workload does not + // end within the setTimeLimit time. LoadTestProcessDefinition serverLoadTestInvocation = test.createLoadTestSpecification() .addJvmOption("-Xmx256m") .addJvmOption("-Dcom.sun.management.jmxremote.port=1234") @@ -94,7 +96,7 @@ public void execute(StfCoreExtension test) throws StfException { .setTimeLimit("30m") .setAbortAtFailureLimit(-1) .addSuite("mini-mix") - .setSuiteNumTests(900000) + .setSuiteNumTests(20000000) .setSuiteInventory(inventoryFile) .setSuiteThreadCount(30) .setSuiteRandomSelection(); diff --git a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryNoAuth.java b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryNoAuth.java index d52247c1..c81623c4 100644 --- a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryNoAuth.java +++ b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteMemoryNoAuth.java @@ -62,6 +62,8 @@ public void execute(StfCoreExtension test) throws StfException { // Process definition for the monitored server JVM String inventoryFile = "/openjdk.test.load/config/inventories/mix/mini-mix.xml"; + // setSuiteNumTests and setSuiteThreadCount need to be big enough to ensure the workload does not + // end within the setTimeLimit time. LoadTestProcessDefinition serverJavaInvocation = test.createLoadTestSpecification() .addJvmOption("-Xmx256m") .addJvmOption("-Dcom.sun.management.jmxremote.port=1234") @@ -75,7 +77,7 @@ public void execute(StfCoreExtension test) throws StfException { .setTimeLimit("30m") .setAbortAtFailureLimit(-1) .addSuite("mini-mix") - .setSuiteNumTests(900000) + .setSuiteNumTests(20000000) .setSuiteInventory(inventoryFile) .setSuiteThreadCount(30) .setSuiteRandomSelection(); diff --git a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteNotifierProxyAuth.java b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteNotifierProxyAuth.java index eab2eecc..bbf9d3eb 100644 --- a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteNotifierProxyAuth.java +++ b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteNotifierProxyAuth.java @@ -72,6 +72,8 @@ public void execute(StfCoreExtension test) throws StfException { // Process definition for the server JVM String inventoryFile = "/openjdk.test.load/config/inventories/mix/mini-mix.xml"; + // setSuiteNumTests and setSuiteThreadCount need to be big enough to ensure the workload does not + // end within the setTimeLimit time. LoadTestProcessDefinition serverJavaInvocation = test.createLoadTestSpecification() .addJvmOption("-Xmx256m") .addJvmOption("-Dcom.sun.management.jmxremote.port=1234") @@ -91,7 +93,7 @@ public void execute(StfCoreExtension test) throws StfException { .setTimeLimit("30m") .setAbortAtFailureLimit(-1) .addSuite("mini-mix") - .setSuiteNumTests(900000) + .setSuiteNumTests(20000000) .setSuiteInventory(inventoryFile) .setSuiteThreadCount(30) .setSuiteRandomSelection(); diff --git a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadAuth.java b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadAuth.java index 6de88320..13cb2345 100644 --- a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadAuth.java +++ b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadAuth.java @@ -75,6 +75,8 @@ public void execute(StfCoreExtension test) throws StfException { // Process definition for the monitored server JVM String inventoryFile = "/openjdk.test.load/config/inventories/mix/mini-mix.xml"; + // setSuiteNumTests and setSuiteThreadCount need to be big enough to ensure the workload does not + // end within the setTimeLimit time. LoadTestProcessDefinition serverLoadTestInvocation = test.createLoadTestSpecification() .addJvmOption("-Xmx256m") .addJvmOption("-Dcom.sun.management.jmxremote.port=1234") @@ -94,7 +96,7 @@ public void execute(StfCoreExtension test) throws StfException { .setTimeLimit("30m") .setAbortAtFailureLimit(-1) .addSuite("mini-mix") - .setSuiteNumTests(900000) + .setSuiteNumTests(20000000) .setSuiteInventory(inventoryFile) .setSuiteThreadCount(30) .setSuiteRandomSelection(); diff --git a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadNoAuth.java b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadNoAuth.java index d5ebc4e7..aba0d363 100644 --- a/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadNoAuth.java +++ b/openjdk.test.jlm/src/test.jlm/net/adoptopenjdk/test/jlm/TestJlmRemoteThreadNoAuth.java @@ -67,6 +67,8 @@ public void execute(StfCoreExtension test) throws StfException { // Process definition for the server JVM String inventoryFile = "/openjdk.test.load/config/inventories/mix/mini-mix.xml"; + // setSuiteNumTests and setSuiteThreadCount need to be big enough to ensure the workload does not + // end within the setTimeLimit time. LoadTestProcessDefinition serverLoadTestInvocation = test.createLoadTestSpecification() .addJvmOption("-Xmx256m") .addJvmOption("-Dcom.sun.management.jmxremote.port=1234") @@ -80,7 +82,7 @@ public void execute(StfCoreExtension test) throws StfException { .setTimeLimit("30m") .setAbortAtFailureLimit(-1) .addSuite("mini-mix") - .setSuiteNumTests(900000) + .setSuiteNumTests(20000000) .setSuiteInventory(inventoryFile) .setSuiteThreadCount(30) .setSuiteRandomSelection();