You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2019/01/09 18:32:42 UTC
[geode-benchmarks] branch develop updated: Changing the test
parameters (#37)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new e3c3ae8 Changing the test parameters (#37)
e3c3ae8 is described below
commit e3c3ae8c74b72da0665596b4ffca2717d47e26dc
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Wed Jan 9 10:32:37 2019 -0800
Changing the test parameters (#37)
* Changing the test data package name to be able to run old geode versions
* Test create smaller JVM for travis to be able to run it.
---
.../benchmark/geode/data/CollectionHolder.java | 2 +-
.../benchmark/geode/data/Portfolio.java | 2 +-
.../apache => }/benchmark/geode/data/Position.java | 2 +-
.../geode/benchmark/tasks/PrePopulateRegion.java | 2 +-
.../org/apache/geode/benchmark/tasks/PutTask.java | 2 +-
.../apache/geode/benchmark/tasks/StartClient.java | 2 +-
.../apache/geode/benchmark/tasks/StartServer.java | 2 +-
.../benchmark/tasks/PrePopulateRegionTest.java | 2 +-
.../org/apache/geode/perftest/TestRunners.java | 32 ++++++++++++++++++++++
9 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/CollectionHolder.java b/geode-benchmarks/src/main/java/benchmark/geode/data/CollectionHolder.java
similarity index 97%
rename from geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/CollectionHolder.java
rename to geode-benchmarks/src/main/java/benchmark/geode/data/CollectionHolder.java
index efbb490..8fd839a 100644
--- a/geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/CollectionHolder.java
+++ b/geode-benchmarks/src/main/java/benchmark/geode/data/CollectionHolder.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.benchmark.geode.data;
+package benchmark.geode.data;
import java.util.Arrays;
diff --git a/geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/Portfolio.java b/geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java
similarity index 99%
rename from geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/Portfolio.java
rename to geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java
index 8505893..6c3414c 100644
--- a/geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/Portfolio.java
+++ b/geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.benchmark.geode.data;
+package benchmark.geode.data;
import java.util.ArrayList;
diff --git a/geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/Position.java b/geode-benchmarks/src/main/java/benchmark/geode/data/Position.java
similarity index 99%
rename from geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/Position.java
rename to geode-benchmarks/src/main/java/benchmark/geode/data/Position.java
index 40a7281..54bb6bc 100644
--- a/geode-benchmarks/src/main/java/org/apache/benchmark/geode/data/Position.java
+++ b/geode-benchmarks/src/main/java/benchmark/geode/data/Position.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.benchmark.geode.data;
+package benchmark.geode.data;
public class Position {
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PrePopulateRegion.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PrePopulateRegion.java
index c0a7a71..fd119c0 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PrePopulateRegion.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PrePopulateRegion.java
@@ -30,7 +30,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.apache.benchmark.geode.data.Portfolio;
+import benchmark.geode.data.Portfolio;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PutTask.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PutTask.java
index 9650057..b077767 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PutTask.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/PutTask.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
-import org.apache.benchmark.geode.data.Portfolio;
+import benchmark.geode.data.Portfolio;
import org.yardstickframework.BenchmarkConfiguration;
import org.yardstickframework.BenchmarkDriverAdapter;
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java
index add2309..13d20f4 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java
@@ -46,7 +46,7 @@ public class StartClient implements Task {
String statsFile = new File(context.getOutputDir(), "stats.gfs").getAbsolutePath();
ClientCache clientCache = new ClientCacheFactory(GeodeProperties.clientProperties())
- .setPdxSerializer(new ReflectionBasedAutoSerializer("org.apache.benchmark.geode.data.*"))
+ .setPdxSerializer(new ReflectionBasedAutoSerializer("benchmark.geode.data.*"))
.addPoolLocator(locator.getHostAddress(), locatorPort)
.set(ConfigurationProperties.STATISTIC_ARCHIVE_FILE, statsFile)
.create();
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java
index e1cedde..7c18db6 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java
@@ -46,7 +46,7 @@ public class StartServer implements Task {
String locatorString = LocatorUtil.getLocatorString(context, locatorPort);
String statsFile = new File(context.getOutputDir(), "stats.gfs").getAbsolutePath();
Cache cache = new CacheFactory(GeodeProperties.serverProperties())
- .setPdxSerializer(new ReflectionBasedAutoSerializer("org.apache.benchmark.geode.data.*"))
+ .setPdxSerializer(new ReflectionBasedAutoSerializer("benchmark.geode.data.*"))
.set(ConfigurationProperties.LOCATORS, locatorString)
.set(ConfigurationProperties.NAME,
"server-" + context.getJvmID() + "-" + InetAddress.getLocalHost())
diff --git a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/PrePopulateRegionTest.java b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/PrePopulateRegionTest.java
index 9ad091a..7770bad 100644
--- a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/PrePopulateRegionTest.java
+++ b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/PrePopulateRegionTest.java
@@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.LongStream;
-import org.apache.benchmark.geode.data.Portfolio;
+import benchmark.geode.data.Portfolio;
import org.junit.jupiter.api.Test;
class PrePopulateRegionTest {
diff --git a/harness/src/main/java/org/apache/geode/perftest/TestRunners.java b/harness/src/main/java/org/apache/geode/perftest/TestRunners.java
index 9b5e5af..680071b 100644
--- a/harness/src/main/java/org/apache/geode/perftest/TestRunners.java
+++ b/harness/src/main/java/org/apache/geode/perftest/TestRunners.java
@@ -41,6 +41,34 @@ public class TestRunners {
public static final String TEST_HOSTS = "TEST_HOSTS";
public static final String OUTPUT_DIR = "OUTPUT_DIR";
+ public static final String[] JVM_ARGS_SMALL_SIZE = new String[] {
+ "-XX:CMSInitiatingOccupancyFraction=60",
+ "-XX:+PrintGCDetails",
+ "-XX:+PrintGCTimeStamps",
+ "-XX:+PrintGCDateStamps",
+ "-XX:+PrintGCApplicationStoppedTime",
+ "-XX:+PrintGCApplicationConcurrentTime",
+ "-XX:+UseGCLogFileRotation",
+ "-XX:NumberOfGCLogFiles=20",
+ "-XX:GCLogFileSize=1M",
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:ParGCCardsPerStrideChunk=32768",
+ "-XX:+UseNUMA",
+ "-XX:+UseConcMarkSweepGC",
+ "-XX:+UseCMSInitiatingOccupancyOnly",
+ "-XX:+CMSClassUnloadingEnabled",
+ "-XX:+DisableExplicitGC",
+ "-XX:+ScavengeBeforeFullGC",
+ "-XX:+CMSScavengeBeforeRemark",
+ "-server",
+ "-Djava.awt.headless=true",
+ "-Dsun.rmi.dgc.server.gcInterval=9223372036854775806",
+ "-Dgemfire.OSProcess.ENABLE_OUTPUT_REDIRECTION=true",
+ "-Dgemfire.launcher.registerSignalHandlers=true",
+ "-Xmx4g",
+ "-Xms4g"
+
+ };
public static TestRunner defaultRunner(String username, File outputDir, String... hosts) {
return new DefaultTestRunner(
@@ -82,6 +110,10 @@ public class TestRunners {
config.warmupSeconds(0);
config.durationSeconds(1);
config.threads(1);
+ config.getRoles().entrySet().stream().forEach(entry -> {
+ config.jvmArgs(entry.getKey(), JVM_ARGS_SMALL_SIZE);
+ });
+
super.runTest(config, testName);
}
};