Skip to content

Commit caaee2e

Browse files
cpuguy83vieux
cpuguy83
authored and
vieux
committed
Make graphdriver plugin use plugin BasePath
Also enables `PropagatedMount` for graphdrivers. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 5002104) Signed-off-by: Victor Vieux <vieux@docker.com>
1 parent 315c349 commit caaee2e

File tree

6 files changed

+63
-22
lines changed

6 files changed

+63
-22
lines changed

‎daemon/graphdriver/driver.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,12 @@ func GetDriver(name, home string, options []string, uidMaps, gidMaps []idtools.I
154154
if initFunc, exists := drivers[name]; exists {
155155
return initFunc(filepath.Join(home, name), options, uidMaps, gidMaps)
156156
}
157-
if pluginDriver, err := lookupPlugin(name, home, options, pg); err == nil {
157+
158+
pluginDriver, err := lookupPlugin(name, home, options, pg)
159+
if err == nil {
158160
return pluginDriver, nil
159161
}
160-
logrus.Errorf("Failed to GetDriver graph %s %s", name, home)
162+
logrus.WithError(err).WithField("driver", name).WithField("home-dir", home).Error("Failed to GetDriver graph")
161163
return nil, ErrNotSupported
162164
}
163165

‎daemon/graphdriver/plugin.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"path/filepath"
77

88
"github.com/docker/docker/pkg/plugingetter"
9+
"github.com/docker/docker/plugin/v2"
910
)
1011

1112
type pluginClient interface {
@@ -26,6 +27,13 @@ func lookupPlugin(name, home string, opts []string, pg plugingetter.PluginGetter
2627
}
2728

2829
func newPluginDriver(name, home string, opts []string, pl plugingetter.CompatPlugin) (Driver, error) {
29-
proxy := &graphDriverProxy{name, pl.Client(), pl}
30+
if !pl.IsV1() {
31+
if p, ok := pl.(*v2.Plugin); ok {
32+
if p.PropagatedMount != "" {
33+
home = p.PluginObj.Config.PropagatedMount
34+
}
35+
}
36+
}
37+
proxy := &graphDriverProxy{name, pl}
3038
return proxy, proxy.Init(filepath.Join(home, name), opts)
3139
}

‎daemon/graphdriver/proxy.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import (
44
"errors"
55
"fmt"
66
"io"
7+
"path/filepath"
78

89
"github.com/docker/docker/pkg/archive"
910
"github.com/docker/docker/pkg/plugingetter"
1011
)
1112

1213
type graphDriverProxy struct {
13-
name string
14-
client pluginClient
15-
p plugingetter.CompatPlugin
14+
name string
15+
p plugingetter.CompatPlugin
1616
}
1717

1818
type graphDriverRequest struct {
@@ -48,7 +48,7 @@ func (d *graphDriverProxy) Init(home string, opts []string) error {
4848
Opts: opts,
4949
}
5050
var ret graphDriverResponse
51-
if err := d.client.Call("GraphDriver.Init", args, &ret); err != nil {
51+
if err := d.p.Client().Call("GraphDriver.Init", args, &ret); err != nil {
5252
return err
5353
}
5454
if ret.Err != "" {
@@ -73,7 +73,7 @@ func (d *graphDriverProxy) CreateReadWrite(id, parent string, opts *CreateOpts)
7373
MountLabel: mountLabel,
7474
}
7575
var ret graphDriverResponse
76-
if err := d.client.Call("GraphDriver.CreateReadWrite", args, &ret); err != nil {
76+
if err := d.p.Client().Call("GraphDriver.CreateReadWrite", args, &ret); err != nil {
7777
return err
7878
}
7979
if ret.Err != "" {
@@ -93,7 +93,7 @@ func (d *graphDriverProxy) Create(id, parent string, opts *CreateOpts) error {
9393
MountLabel: mountLabel,
9494
}
9595
var ret graphDriverResponse
96-
if err := d.client.Call("GraphDriver.Create", args, &ret); err != nil {
96+
if err := d.p.Client().Call("GraphDriver.Create", args, &ret); err != nil {
9797
return err
9898
}
9999
if ret.Err != "" {
@@ -105,7 +105,7 @@ func (d *graphDriverProxy) Create(id, parent string, opts *CreateOpts) error {
105105
func (d *graphDriverProxy) Remove(id string) error {
106106
args := &graphDriverRequest{ID: id}
107107
var ret graphDriverResponse
108-
if err := d.client.Call("GraphDriver.Remove", args, &ret); err != nil {
108+
if err := d.p.Client().Call("GraphDriver.Remove", args, &ret); err != nil {
109109
return err
110110
}
111111
if ret.Err != "" {
@@ -120,20 +120,20 @@ func (d *graphDriverProxy) Get(id, mountLabel string) (string, error) {
120120
MountLabel: mountLabel,
121121
}
122122
var ret graphDriverResponse
123-
if err := d.client.Call("GraphDriver.Get", args, &ret); err != nil {
123+
if err := d.p.Client().Call("GraphDriver.Get", args, &ret); err != nil {
124124
return "", err
125125
}
126126
var err error
127127
if ret.Err != "" {
128128
err = errors.New(ret.Err)
129129
}
130-
return ret.Dir, err
130+
return filepath.Join(d.p.BasePath(), ret.Dir), err
131131
}
132132

133133
func (d *graphDriverProxy) Put(id string) error {
134134
args := &graphDriverRequest{ID: id}
135135
var ret graphDriverResponse
136-
if err := d.client.Call("GraphDriver.Put", args, &ret); err != nil {
136+
if err := d.p.Client().Call("GraphDriver.Put", args, &ret); err != nil {
137137
return err
138138
}
139139
if ret.Err != "" {
@@ -145,7 +145,7 @@ func (d *graphDriverProxy) Put(id string) error {
145145
func (d *graphDriverProxy) Exists(id string) bool {
146146
args := &graphDriverRequest{ID: id}
147147
var ret graphDriverResponse
148-
if err := d.client.Call("GraphDriver.Exists", args, &ret); err != nil {
148+
if err := d.p.Client().Call("GraphDriver.Exists", args, &ret); err != nil {
149149
return false
150150
}
151151
return ret.Exists
@@ -154,7 +154,7 @@ func (d *graphDriverProxy) Exists(id string) bool {
154154
func (d *graphDriverProxy) Status() [][2]string {
155155
args := &graphDriverRequest{}
156156
var ret graphDriverResponse
157-
if err := d.client.Call("GraphDriver.Status", args, &ret); err != nil {
157+
if err := d.p.Client().Call("GraphDriver.Status", args, &ret); err != nil {
158158
return nil
159159
}
160160
return ret.Status
@@ -165,7 +165,7 @@ func (d *graphDriverProxy) GetMetadata(id string) (map[string]string, error) {
165165
ID: id,
166166
}
167167
var ret graphDriverResponse
168-
if err := d.client.Call("GraphDriver.GetMetadata", args, &ret); err != nil {
168+
if err := d.p.Client().Call("GraphDriver.GetMetadata", args, &ret); err != nil {
169169
return nil, err
170170
}
171171
if ret.Err != "" {
@@ -184,7 +184,7 @@ func (d *graphDriverProxy) Cleanup() error {
184184

185185
args := &graphDriverRequest{}
186186
var ret graphDriverResponse
187-
if err := d.client.Call("GraphDriver.Cleanup", args, &ret); err != nil {
187+
if err := d.p.Client().Call("GraphDriver.Cleanup", args, &ret); err != nil {
188188
return nil
189189
}
190190
if ret.Err != "" {
@@ -198,7 +198,7 @@ func (d *graphDriverProxy) Diff(id, parent string) (io.ReadCloser, error) {
198198
ID: id,
199199
Parent: parent,
200200
}
201-
body, err := d.client.Stream("GraphDriver.Diff", args)
201+
body, err := d.p.Client().Stream("GraphDriver.Diff", args)
202202
if err != nil {
203203
return nil, err
204204
}
@@ -211,7 +211,7 @@ func (d *graphDriverProxy) Changes(id, parent string) ([]archive.Change, error)
211211
Parent: parent,
212212
}
213213
var ret graphDriverResponse
214-
if err := d.client.Call("GraphDriver.Changes", args, &ret); err != nil {
214+
if err := d.p.Client().Call("GraphDriver.Changes", args, &ret); err != nil {
215215
return nil, err
216216
}
217217
if ret.Err != "" {
@@ -223,7 +223,7 @@ func (d *graphDriverProxy) Changes(id, parent string) ([]archive.Change, error)
223223

224224
func (d *graphDriverProxy) ApplyDiff(id, parent string, diff io.Reader) (int64, error) {
225225
var ret graphDriverResponse
226-
if err := d.client.SendFile(fmt.Sprintf("GraphDriver.ApplyDiff?id=%s&parent=%s", id, parent), diff, &ret); err != nil {
226+
if err := d.p.Client().SendFile(fmt.Sprintf("GraphDriver.ApplyDiff?id=%s&parent=%s", id, parent), diff, &ret); err != nil {
227227
return -1, err
228228
}
229229
if ret.Err != "" {
@@ -238,7 +238,7 @@ func (d *graphDriverProxy) DiffSize(id, parent string) (int64, error) {
238238
Parent: parent,
239239
}
240240
var ret graphDriverResponse
241-
if err := d.client.Call("GraphDriver.DiffSize", args, &ret); err != nil {
241+
if err := d.p.Client().Call("GraphDriver.DiffSize", args, &ret); err != nil {
242242
return -1, err
243243
}
244244
if ret.Err != "" {

‎integration-cli/docker_cli_daemon_plugins_test.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,24 @@ func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
257257
c.Assert(exists, checker.Equals, true)
258258
}
259259

260+
func (s *DockerDaemonSuite) TestGraphdriverPlugin(c *check.C) {
261+
testRequires(c, Network, IsAmd64, DaemonIsLinux, overlaySupported)
262+
263+
s.d.Start()
264+
265+
// install the plugin
266+
plugin := "cpuguy83/docker-overlay2-graphdriver-plugin"
267+
out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", plugin)
268+
c.Assert(err, checker.IsNil, check.Commentf(out))
269+
270+
// restart the daemon with the plugin set as the storage driver
271+
s.d.Restart("-s", plugin)
272+
273+
// run a container
274+
out, err = s.d.Cmd("run", "--rm", "busybox", "true") // this will pull busybox using the plugin
275+
c.Assert(err, checker.IsNil, check.Commentf(out))
276+
}
277+
260278
func existsMountpointWithPrefix(mountpointPrefix string) (bool, error) {
261279
mounts, err := mount.GetMounts()
262280
if err != nil {

‎integration-cli/requirements_unix.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
package main
44

55
import (
6+
"bytes"
67
"io/ioutil"
8+
"os/exec"
79
"strings"
810

911
"github.com/docker/docker/pkg/sysinfo"
@@ -122,6 +124,17 @@ var (
122124
},
123125
"Test cannot be run without a kernel (4.3+) supporting ambient capabilities",
124126
}
127+
overlaySupported = testRequirement{
128+
func() bool {
129+
cmd := exec.Command(dockerBinary, "run", "--rm", "busybox", "/bin/sh", "-c", "cat /proc/filesystems")
130+
out, err := cmd.CombinedOutput()
131+
if err != nil {
132+
return false
133+
}
134+
return bytes.Contains(out, []byte("overlay\n"))
135+
},
136+
"Test cannot be run wihtout suppport for ovelayfs",
137+
}
125138
)
126139

127140
func init() {

‎plugin/manager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (pm *Manager) reload() error {
156156

157157
// We should only enable rootfs propagation for certain plugin types that need it.
158158
for _, typ := range p.PluginObj.Config.Interface.Types {
159-
if typ.Capability == "volumedriver" && typ.Prefix == "docker" && strings.HasPrefix(typ.Version, "1.") {
159+
if (typ.Capability == "volumedriver" || typ.Capability == "graphdriver") && typ.Prefix == "docker" && strings.HasPrefix(typ.Version, "1.") {
160160
if p.PluginObj.Config.PropagatedMount != "" {
161161
// TODO: sanitize PropagatedMount and prevent breakout
162162
p.PropagatedMount = filepath.Join(p.Rootfs, p.PluginObj.Config.PropagatedMount)

0 commit comments

Comments
 (0)