Skip to content
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.

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

Stabilize CouchbaseContainer by merging the Socat command #2081

Merged
merged 1 commit into from
Nov 18, 2019

Conversation

bsideup
Copy link
Member

@bsideup bsideup commented Nov 17, 2019

Fixes #1453

.exec();

dockerClient.execStartCmd(createCmdResponse.getId())
.exec(new ExecStartResultCallback());
.exec(new ExecStartResultCallback())
.awaitCompletion(10, TimeUnit.SECONDS);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI we were missing awaitStarted here, and I guess it caused some races

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

Copy link
Member

@kiview kiview left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth a try 👍

.exec();

dockerClient.execStartCmd(createCmdResponse.getId())
.exec(new ExecStartResultCallback());
.exec(new ExecStartResultCallback())
.awaitCompletion(10, TimeUnit.SECONDS);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

@bsideup bsideup marked this pull request as ready for review November 18, 2019 07:00
@bsideup bsideup requested a review from rnorth as a code owner November 18, 2019 07:00
@rnorth
Copy link
Member

rnorth commented Nov 18, 2019

Nice! Absence of this looks like a bug, so let's merge it.

I'm running a soak test for this change and will report back this evening. Fingers crossed! 🤞

@bsideup bsideup added this to the next milestone Nov 18, 2019
@bsideup bsideup merged commit 8dee638 into master Nov 18, 2019
@delete-merged-branch delete-merged-branch bot deleted the simplify_CouchbaseContainer branch November 18, 2019 13:16
bsideup added a commit that referenced this pull request Nov 27, 2019
* Restore `@Flaky` in Couchbase tests (partially revert #2081)

* Manually start/stop container, do not reuse environment/cluster
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Intermittent couchbase failures in CI
3 participants