IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from nosqlbench/testbranch

Browse Source 
Testbranch
This commit is contained in:
Jonathan Shook 2020-03-25 14:35:26 -05:00 committed by GitHub
commit 2d9adf297f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View File

@ -4,8 +4,9 @@ on:
push: push:
branches: branches:
- master - master
tags-ignore: - testbranch
- invoke-release tags:
- '!invoke-release'
jobs: jobs:
build: build:

4
engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsHelper.java
View File

@ -57,8 +57,8 @@ public class DockerMetricsHelper {
System.getProperties().setProperty(DOCKER_HOST, DOCKER_HOST_ADDR); System.getProperties().setProperty(DOCKER_HOST, DOCKER_HOST_ADDR);
this.config = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(DOCKER_HOST_ADDR).build(); this.config = DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(DOCKER_HOST_ADDR).build();
DockerCmdExecFactory dockerCmdExecFactory = new OkHttpDockerCmdExecFactory() DockerCmdExecFactory dockerCmdExecFactory = new OkHttpDockerCmdExecFactory()
.withReadTimeout(1000) .withReadTimeout(10000)
.withConnectTimeout(1000); .withConnectTimeout(10000);
// DockerCmdExecFactory dockerCmdExecFactory = new JerseyDockerCmdExecFactory() // DockerCmdExecFactory dockerCmdExecFactory = new JerseyDockerCmdExecFactory()
// .withReadTimeout(1000) // .withReadTimeout(1000)