diff options
| author | valerijf <valerijf@yahoo-inc.com> | 2016-10-05 10:41:59 +0200 |
|---|---|---|
| committer | valerijf <valerijf@yahoo-inc.com> | 2016-10-06 14:15:48 +0200 |
| commit | c076aea9556a8d86423d183a266bde60640a4501 (patch) | |
| tree | afa0dd4da96da585c28a828eaadabc8cc5dcba99 /docker-api | |
| parent | a3e2da92e15bc743011253d7bc177b128324b074 (diff) | |
Code review fixes
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 5 | ||||
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerStatsCmd.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 503c2efb8cd..f3e2b19f1da 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -292,8 +292,9 @@ public class DockerImpl implements Docker { public ContainerStats getContainerStats(ContainerName containerName) { try { -// DockerStatsCallback statsCallback = dockerClient.statsCmd(containerName.asString()).exec(new DockerStatsCallback()); -// statsCallback.awaitCompletion(5, TimeUnit.SECONDS); + // TODO: Uncomment this to get container stats through docker-java when the jersey issues are resolved + // DockerStatsCallback statsCallback = dockerClient.statsCmd(containerName.asString()).exec(new DockerStatsCallback()); + // statsCallback.awaitCompletion(5, TimeUnit.SECONDS); Statistics stats = DockerStatsCmd.getContainerStatistics(containerName); return new ContainerStatsImpl(stats.getNetworks(), stats.getCpuStats(), diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerStatsCmd.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerStatsCmd.java index ffc63555f55..a0ee9bedaf2 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerStatsCmd.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerStatsCmd.java @@ -9,6 +9,9 @@ import java.net.URL; /** + * Class that makes HTTP request to get docker container stats as docker-java's + * {@link com.github.dockerjava.api.DockerClient#statsCmd(String)} fails because of jersey version conflict. + * * @author valerijf */ public class DockerStatsCmd { |