Skip to content

acceptance: migrate to docker/engine-api#4282

Merged
tamird merged 5 commits intocockroachdb:masterfrom
tamird:docker-api
Feb 10, 2016
Merged

acceptance: migrate to docker/engine-api#4282
tamird merged 5 commits intocockroachdb:masterfrom
tamird:docker-api

Conversation

@tamird
Copy link
Copy Markdown
Contributor

@tamird tamird commented Feb 9, 2016

Commit history is a mess, I'll fix it up before merging.

Chaos test is currently failing on my machine, and I have no idea why.

Review on Reviewable

@tamird
Copy link
Copy Markdown
Contributor Author

tamird commented Feb 9, 2016

Argh, this is a good one. One of the dependencies uses build tags that distinguish linux from OS X, so glock save ... does the wrong thing on OS X. I had to resort to build/builder.sh glock save ... to get the correct GLOCKFILE generated.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

funny how everything just reversed.

@BramGruneir
Copy link
Copy Markdown
Member

I gave the code a quick scan, overall looks good, but I'll do an in depth pass tomorrow morning. What version of docker are you running locally?

@tamird
Copy link
Copy Markdown
Contributor Author

tamird commented Feb 10, 2016

1.9.1
On Feb 10, 2016 01:56, "Bram Gruneir" notifications@github.com wrote:

I gave the code a quick scan, overall looks good, but I'll do an in depth
pass tomorrow morning. What version of docker are you running locally?


Reply to this email directly or view it on GitHub
#4282 (comment)
.

@BramGruneir
Copy link
Copy Markdown
Member

Cool. I'll test it against my setup with v1.10
On Feb 10, 2016 06:25, "Tamir Duberstein" notifications@github.com wrote:

1.9.1
On Feb 10, 2016 01:56, "Bram Gruneir" notifications@github.com wrote:

I gave the code a quick scan, overall looks good, but I'll do an in depth
pass tomorrow morning. What version of docker are you running locally?


Reply to this email directly or view it on GitHub
<
https://github.com/cockroachdb/cockroach/pull/4282#issuecomment-182230773>
.


Reply to this email directly or view it on GitHub
#4282 (comment)
.

@tbg
Copy link
Copy Markdown
Member

tbg commented Feb 10, 2016

LGTM, I'm going to try running it now.


Reviewed 2 of 4 files at r1, 5 of 5 files at r5.
Review status: all files reviewed at latest revision, 2 unresolved discussions.


acceptance/chaos_test.go, line 224 [r5] (raw file):
Feel strongly about this label? They always strike me as nasty. Maybe

madeProgress := func() bool {
  c.Assert(t)
  for i, client := .... { ... }
  return false
}

for !madeProgress() {
  time.Sleep(time.Second)
}

Comments from the review on Reviewable.io

@tamird
Copy link
Copy Markdown
Contributor Author

tamird commented Feb 10, 2016

Review status: 4 of 7 files reviewed at latest revision, 2 unresolved discussions.


acceptance/chaos_test.go, line 224 [r5] (raw file):
Done.


Comments from the review on Reviewable.io

@tamird
Copy link
Copy Markdown
Contributor Author

tamird commented Feb 10, 2016

OK this is finally green. @tschottdorf or @petermattis can I get sign-off?

@BramGruneir
Copy link
Copy Markdown
Member

LGTM

@BramGruneir
Copy link
Copy Markdown
Member

Also, passes locally with docker 1.10 for me.

@tbg
Copy link
Copy Markdown
Member

tbg commented Feb 10, 2016

Still trying to fix my Docker....... but LGTM


Reviewed 3 of 3 files at r6.
Review status: all files reviewed at latest revision, 1 unresolved discussion.


acceptance/cluster/docker.go, line 102 [r6] (raw file):
I remember that error, and thought ignoring it fixed the issue (it still deleted it (?)). Have you checked?


Comments from the review on Reviewable.io

@tamird
Copy link
Copy Markdown
Contributor Author

tamird commented Feb 10, 2016

Review status: all files reviewed at latest revision, 1 unresolved discussion.


acceptance/cluster/docker.go, line 102 [r6] (raw file):
I don't know, actually. Let me try it in a follow-up PR in which I ignore the error.


Comments from the review on Reviewable.io

tamird added a commit that referenced this pull request Feb 10, 2016
acceptance: migrate to docker/engine-api
@tamird tamird merged commit 1033974 into cockroachdb:master Feb 10, 2016
@tamird tamird deleted the docker-api branch February 10, 2016 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants