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

Move heartbeat code after getversion 

Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
This commit is contained in:
Jean-Laurent de Morlhon 2015-12-02 15:34:58 +01:00
parent 88f6fce204
commit 225abe05fe
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ type RPCCall struct {
type InternalClient struct { type InternalClient struct {
MachineName string MachineName string
RPCClient *rpc.Client RPCClient *rpc.Client
RPCServiceName string rpcServiceName string
} }
const ( const (
@ -71,21 +71,17 @@ func (ic *InternalClient) Call(serviceMethod string, args interface{}, reply int
if serviceMethod != HeartbeatMethod { if serviceMethod != HeartbeatMethod {
log.Debugf("(%s) Calling %+v", ic.MachineName, serviceMethod) log.Debugf("(%s) Calling %+v", ic.MachineName, serviceMethod)
} }
return ic.RPCClient.Call(ic.RPCServiceName+serviceMethod, args, reply) return ic.RPCClient.Call(ic.rpcServiceName+serviceMethod, args, reply)
} }
func (ic *InternalClient) IsV1() bool { func (ic *InternalClient) switchToV0() {
return ic.RPCServiceName == RPCServiceNameV1 ic.rpcServiceName = RPCServiceNameV0
}
func (ic *InternalClient) SwitchToV0() {
ic.RPCServiceName = RPCServiceNameV0
} }
func NewInternalClient(rpcclient *rpc.Client) *InternalClient { func NewInternalClient(rpcclient *rpc.Client) *InternalClient {
return &InternalClient{ return &InternalClient{
RPCClient: rpcclient, RPCClient: rpcclient,
RPCServiceName: RPCServiceNameV1, rpcServiceName: RPCServiceNameV1,
} }
} }
@ -120,6 +116,23 @@ func NewRPCClientDriver(driverName string, rawDriver []byte) (*RPCClientDriver,
heartbeatDoneCh: make(chan bool), heartbeatDoneCh: make(chan bool),
} }
var serverVersion int
if err := c.Client.Call(GetVersionMethod, struct{}{}, &serverVersion); err != nil {
// this is the first call we make to the server. We try to play nice with old pre 0.5.1 client,
// by gracefully trying old RPCServiceName, we do this only once, and keep the result for future calls.
log.Debugf(err.Error())
log.Debugf("Client (%s) with %s does not work, re-attempting with %s", c.Client.MachineName, RPCServiceNameV1, RPCServiceNameV0)
c.Client.switchToV0()
if err := c.Client.Call(GetVersionMethod, struct{}{}, &serverVersion); err != nil {
return nil, err
}
}
if serverVersion != version.APIVersion {
return nil, fmt.Errorf("Driver binary uses an incompatible API version (%d)", serverVersion)
}
log.Debug("Using API Version ", serverVersion)
go func(c *RPCClientDriver) { go func(c *RPCClientDriver) {
for { for {
select { select {
@ -136,27 +149,6 @@ func NewRPCClientDriver(driverName string, rawDriver []byte) (*RPCClientDriver,
} }
}(c) }(c)
var serverVersion int
if err := c.Client.Call(GetVersionMethod, struct{}{}, &serverVersion); err != nil {
// this is the first call we make to the server. We try to play nice with old pre 0.5.1 client,
// by gracefully trying old RPCServiceName, we do this only once, and keep the result for future calls.
if c.Client.IsV1() {
log.Debugf(err.Error())
log.Debugf("Client (%s) with RPCServiceNameV1 does not work, re-attempting with RPCServiceNameV0", c.Client.MachineName)
c.Client.SwitchToV0()
if err := c.Client.Call(GetVersionMethod, struct{}{}, &serverVersion); err != nil {
return nil, err
}
} else {
return nil, err
}
}
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(rawDriver); err != nil { if err := c.SetConfigRaw(rawDriver); err != nil {
return nil, err return nil, err
} }