Skip to content

Conversation

@vdemeester
Copy link
Member

@vdemeester vdemeester commented Jun 3, 2016

Carry PR #22228 🐸.
Resolving conflicts wasn't easy, let's see if my missed something or not 👼

Closes #22228


- What I did

I've renamed the occurrences of GraphDriver by StorageDriver in the code base to be more consistent with the docs.

The only externally-visible change of that PR is a direct API translation of the experimental storage driver plugins API

- How I did it

I've renamed things via grep/replace but I tried to do that carefully, so variable names and comments are also kept consistent.

- How to verify it

I've run make and make test and it seems to work. I need to update docker/go-plugins-helpers#42 to use the new StorageDriver naming scheme, I'll do that once/if that PR is merged.

I've tried to run the integration tests for the CLI. The experimental storage driver plugins seem broken (see below).

- A picture of a cute animal (not mandatory but encouraged)

cute camel

@vdemeester
Copy link
Member Author

Already LGTM from @tiborvass (see original PR)
/cc @thaJeztah @runcom @justincormack

Makefile Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

er "graphdriver" also in this sentence

@thaJeztah
Copy link
Member

Looks like we're running into the same failure again on WindowsTP5, so wondering if there is a relation to this change;

14:43:46 ---> Making bundle: .ensure-frozen-images-windows (in bundles/1.12.0-dev/test-integration-cli)
14:43:46 ERROR: Could not find windowsservercore images

@jhowardmsft any ideas? I already started looking into vendored code, e.g. https://github.com/docker/docker/blob/3d13fddd2bc4d679f0eaa68b0be877e5a816ad53/vendor/src/github.com/Microsoft/hcsshim/layerutils.go#L14-L23, but couldn't find anything really

@icecrime icecrime added the status/failing-ci Indicates that the PR in its current state fails the test suite label Jun 3, 2016
Copy link
Member

Choose a reason for hiding this comment

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

Looking to see anything obvious causing TP5 to fail. This isn't it (I don't think), but why aliased?

Copy link
Member Author

Choose a reason for hiding this comment

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

@lowenna
Copy link
Member

lowenna commented Jun 3, 2016

@thaJeztah The only thing I can spot is the go-winio aliasing. Everything appears fine.

@thaJeztah
Copy link
Member

@jhowardmsft thanks for looking. I was wondering if somehow, somewhere something relied on a name. Just weird. Let me just try to run it again, maybe we've just been very unlucky

@vdemeester
Copy link
Member Author

Hum windowsTP5 is definitely not happy 😅

@lowenna
Copy link
Member

lowenna commented Jun 8, 2016

Went back to look at this failure after redeploying a bunch of TP5 nodes this evening. Unfortunately it now needs a rebase 😢

samoht and others added 10 commits June 8, 2016 18:06
This is already the case in most of the CLI. This PR updates the codebase
to be more consistent. This should not change anything for the user.

Signed-off-by: Thomas Gazagnaire <[email protected]>
This is already the case in most of the CLI. This PR updates the codebase
to be more consistent. This should not change anything for the user.

Signed-off-by: Thomas Gazagnaire <[email protected]>
This is to keep consistent with the name that we are using in the documentation,
where "storage drivers" is prefered over the now deprecated "graph drivers"
terminology.

Signed-off-by: Thomas Gazagnaire <[email protected]>
This match with what the documentation for `--graph` says.

Signed-off-by: Thomas Gazagnaire <[email protected]>
Mainly support for solaris and some windows changes..

Signed-off-by: Vincent Demeester <[email protected]>
@vdemeester
Copy link
Member Author

@jhowardmsft rebased 👼

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/failing-ci Indicates that the PR in its current state fails the test suite status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants