[geode-benchmarks] branch sni updated: scaled all the way back up again

[burcham]

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

burcham pushed a commit to branch sni
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git


The following commit(s) were added to refs/heads/sni by this push:
     new 6da4ad4  scaled all the way back up again
6da4ad4 is described below

commit 6da4ad45babba4dab0bb9360205f865801178cc8
Author: Bill Burcham <bburc...@pivotal.io>
AuthorDate: Mon Jun 1 16:10:53 2020 -0700

    scaled all the way back up again
---
 README.md                                                           | 2 +-
 .../java/org/apache/geode/benchmark/tasks/PrePopulateRegion.java    | 3 +--
 .../org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java   | 6 +-----
 .../apache/geode/benchmark/tests/PartitionedPutBenchmarkSNI.java    | 6 +-----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 6265c4f..d34f747 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ Also we have to provide `-DwithSsl=true` for an SNI test 
even though no SNI test
 * ~~generate `haproxy.cfg` with client-visible SNI hostnames~~
 * ~~turn on SNI via `setPoolSocketFactory` in a new `StartClientSNI` task~~
 * ~~set `--hostname-for-clients` on locator and servers for SNI~~
-* reinstate thread-per-core in `PrePopulateRegion.run()` and in 
`PartitionedPutBenchmark[SNI]`
+* ~~reinstate thread-per-core in `PrePopulateRegion.run()` and in 
`PartitionedPutBenchmark[SNI]` ya~~
 * set `keyRange` back to 1e6 in `PartitionedPutBenchmark[SNI]` after 
client-server connections are healthy
 * make topology orthogonal to tests so all tests can run with SNI; have a 
`-Psni`/`-Dsni` flag
 * fix borken `PartitionedPutBenchmarkSNITest`: 
`DefineHostNamingsOffPlatformTask` breaks when running multiple roles on a 
single host
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 07589aa..faae4d7 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
@@ -77,8 +77,7 @@ public class PrePopulateRegion implements Task {
     logger.info("*******************************************");
     final Instant start = Instant.now();
 
-    // TODO: reinstate
-    final int numThreads = 1; //Runtime.getRuntime().availableProcessors();
+    final int numThreads = Runtime.getRuntime().availableProcessors();
     final ExecutorService threadPool = 
Executors.newFixedThreadPool(numThreads);
     final List<CompletableFuture<Void>> futures = new ArrayList<>();
 
diff --git 
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
 
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
index 4324414..5d8e3fc 100644
--- 
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
+++ 
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
@@ -39,9 +39,7 @@ import org.apache.geode.perftest.TestRunners;
  */
 public class PartitionedPutBenchmark implements PerformanceTest {
 
-  // TODO: reinstate
-  //  private LongRange keyRange = new LongRange(0, 1000000);
-  private LongRange keyRange = new LongRange(0, 10_000);
+  private LongRange keyRange = new LongRange(0, 1_000_000);
 
   public PartitionedPutBenchmark() {}
 
@@ -57,8 +55,6 @@ public class PartitionedPutBenchmark implements 
PerformanceTest {
   @Override
   public TestConfig configure() {
     TestConfig config = GeodeBenchmark.createConfig();
-    // TODO: delete this once test is working!
-    config.threads(100);
     ClientServerTopology.configure(config);
     before(config, new CreatePartitionedRegion(), SERVER);
     before(config, new CreateClientProxyRegion(), CLIENT);
diff --git 
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkSNI.java
 
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkSNI.java
index 841be17..1c7f633 100644
--- 
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkSNI.java
+++ 
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmarkSNI.java
@@ -41,9 +41,7 @@ import org.apache.geode.perftest.TestRunners;
  */
 public class PartitionedPutBenchmarkSNI implements PerformanceTest {
 
-  // TODO; reinstate
-  //  private LongRange keyRange = new LongRange(0, 1000000);
-  private LongRange keyRange = new LongRange(0, 10_000);
+  private LongRange keyRange = new LongRange(0, 1_000_000);
 
   public PartitionedPutBenchmarkSNI() {}
 
@@ -59,8 +57,6 @@ public class PartitionedPutBenchmarkSNI implements 
PerformanceTest {
   @Override
   public TestConfig configure() {
     TestConfig config = GeodeBenchmark.createConfig();
-    // TODO: delete this once test is working!
-    config.threads(100);
     ClientServerTopologyWithSNIProxy.configure(config);
     before(config, new CreatePartitionedRegion(), SERVER);
     before(config, new CreateClientProxyRegion(), CLIENT);