From 69d3bb25d61e88cb69730396720bbe75768a6f48 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 25 Mar 2020 14:07:38 -0500 Subject: [PATCH 1/2] testbranch enabled on actions --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d6071ba9..b970a3b03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,8 +4,9 @@ on: push: branches: - master - tags-ignore: - - invoke-release + - testbranch + tags: + - '!invoke-release' jobs: build: From f107211faa8b5d404219fa3629bec39b5645d261 Mon Sep 17 00:00:00 2001 From: phact Date: Wed, 25 Mar 2020 15:18:55 -0400 Subject: [PATCH 2/2] timeout --- .../java/io/nosqlbench/engine/docker/DockerMetricsHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsHelper.java index e6a084550..668690d5b 100644 --- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsHelper.java +++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsHelper.java @@ -57,8 +57,8 @@ public class DockerMetricsHelper { System.getProperties().setProperty(DOCKER_HOST, DOCKER_HOST_ADDR); this.config = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(DOCKER_HOST_ADDR).build(); DockerCmdExecFactory dockerCmdExecFactory = new OkHttpDockerCmdExecFactory() - .withReadTimeout(1000) - .withConnectTimeout(1000); + .withReadTimeout(10000) + .withConnectTimeout(10000); // DockerCmdExecFactory dockerCmdExecFactory = new JerseyDockerCmdExecFactory() // .withReadTimeout(1000)