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 033b011 fix docker command to stop haproxy 033b011 is described below commit 033b011e518cf4967a2563041aeb922ce310fc95 Author: Bill Burcham <bburc...@pivotal.io> AuthorDate: Tue May 19 11:55:11 2020 -0700 fix docker command to stop haproxy --- .../geode/benchmark/tasks/StartSniProxy.java | 33 +++++----------------- .../apache/geode/benchmark/tasks/StopSniProxy.java | 2 +- 2 files changed, 8 insertions(+), 27 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 3a5b955..8618a89 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 @@ -38,45 +38,26 @@ import org.apache.geode.perftest.TestContext; * Task to start the SNI proxy */ public class StartSniProxy implements Task { - - private static final Logger logger = LoggerFactory.getLogger(StartSniProxy.class); - public static final String START_DOCKER_DAEMON_COMMAND = "sudo service docker start"; public static final String START_PROXY_COMMAND = "docker-compose up -d haproxy"; private int locatorPort; public StartSniProxy(int locatorPort) { - logger.info("BGB StartSniProxy constructed"); this.locatorPort = locatorPort; } @Override public void run(TestContext context) throws Exception { - logger.info("BGB StartSniProxy.run() entered"); - - try { - final String config = generateHaProxyConfig( - hostNamesFor(context, LOCATOR), - hostNamesFor(context, SERVER)); - - logger.info("BGB StartSniProxy.run() generated config"); + final String config = generateHaProxyConfig( + hostNamesFor(context, LOCATOR), + hostNamesFor(context, SERVER)); - writeToFile(config, "haproxy.cfg"); + writeToFile(config, "haproxy.cfg"); - logger.info("BGB StartSniProxy.run() wrote haproxy.cfg"); - - final ProcessControl processControl = new ProcessControl(); - - processControl.runCommand(START_DOCKER_DAEMON_COMMAND); - logger.info("BGB StartSniProxy.run() started Docker daemon"); - processControl.runCommand(START_PROXY_COMMAND); - logger.info("BGB StartSniProxy.run() started HAproxy"); - } catch(final Throwable t) { - logger.error("BGB caught exception in StartSniProxy.run()", t); - throw t; - } - logger.info("BGB StartSniProxy.run() completed without error"); + 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 { diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopSniProxy.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopSniProxy.java index 0511e97..c5ab734 100644 --- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopSniProxy.java +++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StopSniProxy.java @@ -25,7 +25,7 @@ import org.apache.geode.perftest.TestContext; */ public class StopSniProxy implements Task { - public static final String STOP_PROXY_COMMAND = "docker-compose down haproxy"; + public static final String STOP_PROXY_COMMAND = "docker-compose down"; public StopSniProxy() {}