Repository navigation
Commit 0d08a33
authored
The problem is that using `awaitStarted()` on `attach`'s callback on a non-running container leads to the infinite wait for Jersey transport implementation.
This happens when `SelectiveLoggingFilter` is used in `DefaultInvocationBuilder` where it is created with `printEntity = true` parameter. In this case the implementation of `ClientResponseFilter.filter(...)` method in the base `LoggingFilter` class blocks at `responseContext.hasEntity()` until the data is available in the response. This happens because `hasEntity()` reads a single byte to check whether there is any data available in the stream. In the case of `attach` command this method blocks until there is data in stdout/stderr streams. Having data from the streams requires container running, which we cannot do safely without `awaitStarted()` because `attach` command is performed in a separate thread and we need to run `start` only _after_ `attach` request is executed not to loose the data from stdout/stderr streams.
1 parent ce5e9eb commit 0d08a33
2 files changed
Lines changed: 14 additions & 3 deletions
File tree
- docker-java-transport-jersey/src/main/java/com/github/dockerjava/jaxrs
- docker-java/src/test/java/com/github/dockerjava/cmd
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -165,7 +165,7 @@ private JerseyDockerHttpClient( | |||
| 165 | 165 | RequestConfig.Builder requestConfigBuilder = RequestConfig.custom(); | |
| 166 | 166 | ||
| 167 | 167 | // logging may disabled via log level | |
| 168 | - clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); | ||
| 168 | + clientConfig.register(new SelectiveLoggingFilter(LOGGER, false)); | ||
| 169 | 169 | ||
| 170 | 170 | if (readTimeout != null) { | |
| 171 | 171 | requestConfigBuilder.setSocketTimeout(readTimeout); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -28,8 +28,7 @@ | |||
| 28 | 28 | import static org.hamcrest.Matchers.emptyString; | |
| 29 | 29 | import static org.hamcrest.Matchers.equalTo; | |
| 30 | 30 | import static org.hamcrest.Matchers.not; | |
| 31 | - import static org.junit.Assert.assertEquals; | ||
| 32 | - import static org.junit.Assert.assertTrue; | ||
| 31 | + import static org.junit.Assert.*; | ||
| 33 | 32 | ||
| 34 | 33 | /** | |
| 35 | 34 | * @author Kanstantsin Shautsou | |
@@ -80,6 +79,9 @@ public void onNext(Frame frame) { | |||
| 80 | 79 | .withStdIn(in) | |
| 81 | 80 | .exec(callback); | |
| 82 | 81 | ||
| 82 | + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", | ||
| 83 | + callback.awaitStarted(5, SECONDS)); | ||
| 84 | + | ||
| 83 | 85 | dockerClient.startContainerCmd(container.getId()).exec(); | |
| 84 | 86 | ||
| 85 | 87 | out.write((snippet + "\n").getBytes()); | |
@@ -123,6 +125,9 @@ public void onNext(Frame frame) { | |||
| 123 | 125 | .withLogs(true) | |
| 124 | 126 | .exec(callback); | |
| 125 | 127 | ||
| 128 | + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", | ||
| 129 | + callback.awaitStarted(5, SECONDS)); | ||
| 130 | + | ||
| 126 | 131 | dockerClient.startContainerCmd(container.getId()).exec(); | |
| 127 | 132 | ||
| 128 | 133 | callback.awaitCompletion(30, TimeUnit.SECONDS); | |
@@ -164,6 +169,9 @@ public void onNext(Frame frame) { | |||
| 164 | 169 | .withFollowStream(true) | |
| 165 | 170 | .exec(callback); | |
| 166 | 171 | ||
| 172 | + assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`", | ||
| 173 | + callback.awaitStarted(5, SECONDS)); | ||
| 174 | + | ||
| 167 | 175 | dockerClient.startContainerCmd(container.getId()).exec(); | |
| 168 | 176 | ||
| 169 | 177 | callback.awaitCompletion(15, TimeUnit.SECONDS); | |
@@ -213,6 +221,9 @@ public void onNext(Frame frame) { | |||
| 213 | 221 | .withStdIn(stdin) | |
| 214 | 222 | .exec(callback); | |
| 215 | 223 | ||
| 224 | + assertFalse("Processing of the response is not expected to be started" + | ||
| 225 | + " because `attachContainerCmd` with stdin is not supported", callback.awaitStarted(5, SECONDS)); | ||
| 226 | + | ||
| 216 | 227 | dockerClient.startContainerCmd(container.getId()).exec(); | |
| 217 | 228 | ||
| 218 | 229 | callback.awaitCompletion(30, TimeUnit.SECONDS); | |
0 commit comments