X Tutup
Skip to content

Preserve the order of requests to Docker daemon using DefaultInvocationBuilder (#1492) #1494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bsideup merged 6 commits into from
Nov 16, 2020
Merged

Preserve the order of requests to Docker daemon using DefaultInvocationBuilder (#1492) #1494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c37ab41
Preserve the order of requests to Docker daemon using DefaultInvocati…
tejksat Nov 16, 2020
9cd62ee
Rename CountDownLatch variable from misleading onStart to responseRec…
tejksat Nov 16, 2020
6b0183f
Revert changes in DefaultInvocationBuilder.java
tejksat Nov 16, 2020
6d5276b
Do awaitStarted() for attachContainerCmd() callbacks in tests
tejksat Nov 16, 2020
d0cb5a8
Fix "attachContainerStdinUnsupported" test
tejksat Nov 16, 2020
17a7005
Make "attachContainerStdinUnsupported" test complete
tejksat Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...va-transport-jersey/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private JerseyDockerHttpClient(
RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();

// logging may disabled via log level
clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));
clientConfig.register(new SelectiveLoggingFilter(LOGGER, false));

if (readTimeout != null) {
requestConfigBuilder.setSocketTimeout(readTimeout);
Expand Down
15 changes: 13 additions & 2 deletions docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
import static org.hamcrest.Matchers.emptyString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.*;

/**
* @author Kanstantsin Shautsou
Expand Down Expand Up @@ -80,6 +79,9 @@ public void onNext(Frame frame) {
.withStdIn(in)
.exec(callback);

assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`",
callback.awaitStarted(5, SECONDS));

dockerClient.startContainerCmd(container.getId()).exec();

out.write((snippet + "\n").getBytes());
Expand Down Expand Up @@ -123,6 +125,9 @@ public void onNext(Frame frame) {
.withLogs(true)
.exec(callback);

assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`",
callback.awaitStarted(5, SECONDS));

dockerClient.startContainerCmd(container.getId()).exec();

callback.awaitCompletion(30, TimeUnit.SECONDS);
Expand Down Expand Up @@ -164,6 +169,9 @@ public void onNext(Frame frame) {
.withFollowStream(true)
.exec(callback);

assertTrue("Processing of the response should start shortly after executing `attachContainerCmd`",
callback.awaitStarted(5, SECONDS));

dockerClient.startContainerCmd(container.getId()).exec();

callback.awaitCompletion(15, TimeUnit.SECONDS);
Expand Down Expand Up @@ -213,6 +221,9 @@ public void onNext(Frame frame) {
.withStdIn(stdin)
.exec(callback);

assertFalse("Processing of the response is not expected to be started" +
" because `attachContainerCmd` with stdin is not supported", callback.awaitStarted(5, SECONDS));

dockerClient.startContainerCmd(container.getId()).exec();

callback.awaitCompletion(30, TimeUnit.SECONDS);
Expand Down
X Tutup