docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2135 from janeczku/plugin-versioning 

Fail gracefully when plugin binary implements outdated API
This commit is contained in:
Nathan LeClaire 2015-11-04 14:40:54 -08:00
parent ab4b09bfb2 66ca5b07a2
commit 47aa16cff4
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmachine/drivers/plugin/register_driver.go
View File

@ -12,6 +12,7 @@ import (
"github.com/docker/machine/libmachine/drivers" "github.com/docker/machine/libmachine/drivers"
"github.com/docker/machine/libmachine/drivers/plugin/localbinary" "github.com/docker/machine/libmachine/drivers/plugin/localbinary"
"github.com/docker/machine/libmachine/drivers/rpc" "github.com/docker/machine/libmachine/drivers/rpc"
"github.com/docker/machine/libmachine/version"
) )
var ( var (
@ -20,9 +21,11 @@ var (
func RegisterDriver(d drivers.Driver) { func RegisterDriver(d drivers.Driver) {
if os.Getenv(localbinary.PluginEnvKey) != localbinary.PluginEnvVal { if os.Getenv(localbinary.PluginEnvKey) != localbinary.PluginEnvVal {
fmt.Fprintln(os.Stderr, `This is a Docker Machine plugin binary. fmt.Fprintf(os.Stderr, `This is a Docker Machine plugin binary.
Plugin binaries are not intended to be invoked directly. Plugin binaries are not intended to be invoked directly.
Please use this plugin through the main 'docker-machine' binary.`) Please use this plugin through the main 'docker-machine' binary.
(API version: %d)
`, version.ApiVersion)
os.Exit(1) os.Exit(1)
} }

11
libmachine/drivers/rpc/client_driver.go
View File

@ -10,6 +10,7 @@ import (
"github.com/docker/machine/libmachine/log" "github.com/docker/machine/libmachine/log"
"github.com/docker/machine/libmachine/mcnflag" "github.com/docker/machine/libmachine/mcnflag"
"github.com/docker/machine/libmachine/state" "github.com/docker/machine/libmachine/state"
"github.com/docker/machine/libmachine/version"
) )
var ( var (
@ -93,11 +94,15 @@ func NewRpcClientDriver(rawDriverData []byte, driverName string) (*RpcClientDriv
} }
}(c) }(c)
var version int var serverVersion int
if err := c.Client.Call("RpcServerDriver.GetVersion", struct{}{}, &version); err != nil { if err := c.Client.Call("RpcServerDriver.GetVersion", struct{}{}, &serverVersion); err != nil {
return nil, err return nil, err
} }
log.Debug("Using API Version ", version)
if serverVersion != version.ApiVersion {
return nil, fmt.Errorf("Driver binary uses an incompatible API version (%d)", serverVersion)
}
log.Debug("Using API Version ", serverVersion)
if err := c.SetConfigRaw(rawDriverData); err != nil { if err := c.SetConfigRaw(rawDriverData); err != nil {
return nil, err return nil, err