|
@@ -13,9 +13,10 @@ import (
|
|
|
)
|
|
|
|
|
|
type graphDriverProxy struct {
|
|
|
- name string
|
|
|
- p plugingetter.CompatPlugin
|
|
|
- caps Capabilities
|
|
|
+ name string
|
|
|
+ p plugingetter.CompatPlugin
|
|
|
+ caps Capabilities
|
|
|
+ client *plugins.Client
|
|
|
}
|
|
|
|
|
|
type graphDriverRequest struct {
|
|
@@ -57,7 +58,7 @@ func (d *graphDriverProxy) Init(home string, opts []string, uidMaps, gidMaps []i
|
|
|
GIDMaps: gidMaps,
|
|
|
}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Init", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Init", args, &ret); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -74,7 +75,7 @@ func (d *graphDriverProxy) Init(home string, opts []string, uidMaps, gidMaps []i
|
|
|
func (d *graphDriverProxy) fetchCaps() (Capabilities, error) {
|
|
|
args := &graphDriverRequest{}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Capabilities", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Capabilities", args, &ret); err != nil {
|
|
|
if !plugins.IsNotFound(err) {
|
|
|
return Capabilities{}, err
|
|
|
}
|
|
@@ -108,7 +109,7 @@ func (d *graphDriverProxy) create(method, id, parent string, opts *CreateOpts) e
|
|
|
args.StorageOpt = opts.StorageOpt
|
|
|
}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call(method, args, &ret); err != nil {
|
|
|
+ if err := d.client.Call(method, args, &ret); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -120,7 +121,7 @@ func (d *graphDriverProxy) create(method, id, parent string, opts *CreateOpts) e
|
|
|
func (d *graphDriverProxy) Remove(id string) error {
|
|
|
args := &graphDriverRequest{ID: id}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Remove", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Remove", args, &ret); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -135,7 +136,7 @@ func (d *graphDriverProxy) Get(id, mountLabel string) (containerfs.ContainerFS,
|
|
|
MountLabel: mountLabel,
|
|
|
}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Get", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Get", args, &ret); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
var err error
|
|
@@ -148,7 +149,7 @@ func (d *graphDriverProxy) Get(id, mountLabel string) (containerfs.ContainerFS,
|
|
|
func (d *graphDriverProxy) Put(id string) error {
|
|
|
args := &graphDriverRequest{ID: id}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Put", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Put", args, &ret); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -160,7 +161,7 @@ func (d *graphDriverProxy) Put(id string) error {
|
|
|
func (d *graphDriverProxy) Exists(id string) bool {
|
|
|
args := &graphDriverRequest{ID: id}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Exists", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Exists", args, &ret); err != nil {
|
|
|
return false
|
|
|
}
|
|
|
return ret.Exists
|
|
@@ -169,7 +170,7 @@ func (d *graphDriverProxy) Exists(id string) bool {
|
|
|
func (d *graphDriverProxy) Status() [][2]string {
|
|
|
args := &graphDriverRequest{}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Status", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Status", args, &ret); err != nil {
|
|
|
return nil
|
|
|
}
|
|
|
return ret.Status
|
|
@@ -180,7 +181,7 @@ func (d *graphDriverProxy) GetMetadata(id string) (map[string]string, error) {
|
|
|
ID: id,
|
|
|
}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.GetMetadata", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.GetMetadata", args, &ret); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -199,7 +200,7 @@ func (d *graphDriverProxy) Cleanup() error {
|
|
|
|
|
|
args := &graphDriverRequest{}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Cleanup", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Cleanup", args, &ret); err != nil {
|
|
|
return nil
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -213,7 +214,7 @@ func (d *graphDriverProxy) Diff(id, parent string) (io.ReadCloser, error) {
|
|
|
ID: id,
|
|
|
Parent: parent,
|
|
|
}
|
|
|
- body, err := d.p.Client().Stream("GraphDriver.Diff", args)
|
|
|
+ body, err := d.client.Stream("GraphDriver.Diff", args)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
@@ -226,7 +227,7 @@ func (d *graphDriverProxy) Changes(id, parent string) ([]archive.Change, error)
|
|
|
Parent: parent,
|
|
|
}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.Changes", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.Changes", args, &ret); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -238,7 +239,7 @@ func (d *graphDriverProxy) Changes(id, parent string) ([]archive.Change, error)
|
|
|
|
|
|
func (d *graphDriverProxy) ApplyDiff(id, parent string, diff io.Reader) (int64, error) {
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().SendFile(fmt.Sprintf("GraphDriver.ApplyDiff?id=%s&parent=%s", id, parent), diff, &ret); err != nil {
|
|
|
+ if err := d.client.SendFile(fmt.Sprintf("GraphDriver.ApplyDiff?id=%s&parent=%s", id, parent), diff, &ret); err != nil {
|
|
|
return -1, err
|
|
|
}
|
|
|
if ret.Err != "" {
|
|
@@ -253,7 +254,7 @@ func (d *graphDriverProxy) DiffSize(id, parent string) (int64, error) {
|
|
|
Parent: parent,
|
|
|
}
|
|
|
var ret graphDriverResponse
|
|
|
- if err := d.p.Client().Call("GraphDriver.DiffSize", args, &ret); err != nil {
|
|
|
+ if err := d.client.Call("GraphDriver.DiffSize", args, &ret); err != nil {
|
|
|
return -1, err
|
|
|
}
|
|
|
if ret.Err != "" {
|