You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bu...@apache.org on 2020/06/02 22:55:40 UTC
[geode-benchmarks] branch sni updated (a2ef9a7 -> b75f2e8)
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a change to branch sni
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git.
from a2ef9a7 StopClient sleeps 20s before returning
new f902442 try 100s timeouts in HAproxy; eliminate sleep before returning in StopClient
new b75f2e8 rewrite haproxy.cfg when it's modified
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/geode/benchmark/tasks/StartSniProxy.java | 12 ++++++------
.../java/org/apache/geode/benchmark/tasks/StopClient.java | 1 -
.../org/apache/geode/benchmark/tasks/StartSniProxyTest.java | 6 +++---
3 files changed, 9 insertions(+), 10 deletions(-)
[geode-benchmarks] 01/02: try 100s timeouts in HAproxy;
eliminate sleep before returning in StopClient
Posted by bu...@apache.org.
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
commit f902442d98e6b635a048aaac3647ff5183ab8b04
Author: Bill Burcham <bb...@pivotal.io>
AuthorDate: Tue Jun 2 15:33:44 2020 -0700
try 100s timeouts in HAproxy; eliminate sleep before returning in StopClient
---
.../main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java | 6 +++---
.../src/main/java/org/apache/geode/benchmark/tasks/StopClient.java | 1 -
.../java/org/apache/geode/benchmark/tasks/StartSniProxyTest.java | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java
index 7f9d62e..3bdc987 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java
@@ -104,9 +104,9 @@ public class StartSniProxy implements Task {
+ " log stdout format raw local0 debug\n"
+ "defaults\n"
+ " log global\n"
- + " timeout client 10s\n"
- + " timeout connect 10s\n"
- + " timeout server 10s\n"
+ + " timeout client 100s\n"
+ + " timeout connect 100s\n"
+ + " timeout server 100s\n"
+ "frontend sniproxy\n"
+ " bind *:15443\n"
+ " mode tcp\n"
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopClient.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopClient.java
index b43287e..cf23538 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopClient.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopClient.java
@@ -41,7 +41,6 @@ public class StopClient implements Task {
public void run(TestContext context) throws Exception {
ClientCache cache = ClientCacheFactory.getAnyInstance();
cache.close();
- Thread.sleep(20_000);
}
}
diff --git a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/StartSniProxyTest.java b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/StartSniProxyTest.java
index 21803d3..00ffe9a 100644
--- a/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/StartSniProxyTest.java
+++ b/geode-benchmarks/src/test/java/org/apache/geode/benchmark/tasks/StartSniProxyTest.java
@@ -35,9 +35,9 @@ class StartSniProxyTest {
+ " log stdout format raw local0 debug\n"
+ "defaults\n"
+ " log global\n"
- + " timeout client 10s\n"
- + " timeout connect 10s\n"
- + " timeout server 10s\n"
+ + " timeout client 100s\n"
+ + " timeout connect 100s\n"
+ + " timeout server 100s\n"
+ "frontend sniproxy\n"
+ " bind *:15443\n"
+ " mode tcp\n"
[geode-benchmarks] 02/02: rewrite haproxy.cfg when it's modified
Posted by bu...@apache.org.
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
commit b75f2e80f311ae37f5a6f708c572a37348a99edd
Author: Bill Burcham <bb...@pivotal.io>
AuthorDate: Tue Jun 2 15:55:22 2020 -0700
rewrite haproxy.cfg when it's modified
---
.../main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java
index 3bdc987..296d8d9 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartSniProxy.java
@@ -59,15 +59,15 @@ public class StartSniProxy implements Task {
internalHostNamesFor(context, SERVER),
externalHostNamesFor(context, SERVER, namings));
- writeToFile(config, "haproxy.cfg");
+ rewriteFile(config, "haproxy.cfg");
final ProcessControl processControl = new ProcessControl();
processControl.runCommand(START_DOCKER_DAEMON_COMMAND);
processControl.runCommand(START_PROXY_COMMAND);
}
- private void writeToFile(final String content, final String fileName) throws IOException {
- try (final BufferedWriter writer = new BufferedWriter(new FileWriter(fileName))) {
+ private void rewriteFile(final String content, final String fileName) throws IOException {
+ try (final BufferedWriter writer = new BufferedWriter(new FileWriter(fileName, false))) {
writer.write(content);
}
}