2018-12-07 02:13:45 +00:00
|
|
|
package executor
|
|
|
|
|
|
|
|
import (
|
|
|
|
"encoding/json"
|
|
|
|
"fmt"
|
Use init to handle plugin invocation
Currently, nomad "plugin" processes (e.g. executor, logmon, docker_logger) are started as CLI
commands to be handled by command CLI framework. Plugin launchers use
`discover.NomadBinary()` to identify the binary and start it.
This has few downsides: The trivial one is that when running tests, one
must re-compile the nomad binary as the tests need to invoke the nomad
executable to start plugin. This is frequently overlooked, resulting in
puzzlement.
The more significant issue with `executor` in particular is in relation
to external driver:
* Plugin must identify the path of invoking nomad binary, which is not
trivial; `discvoer.NomadBinary()` now returns the path to the plugin
rather than to nomad, preventing external drivers from launching
executors.
* The external driver may get a different version of executor than it
expects (specially if we make a binary incompatible change in future).
This commit addresses both downside by having the plugin invocation
handling through an `init()` call, similar to how libcontainer init
handler is done in [1] and recommened by libcontainer [2]. `init()`
will be invoked and handled properly in tests and external drivers.
For external drivers, this change will cause external drivers to launch
the executor that's compiled against.
There a are a couple of downsides to this approach:
* These specific packages (i.e executor, logmon, and dockerlog) need to
be careful in use of `init()`, package initializers. Must avoid having
command execution rely on any other init in the package. I prefixed
files with `z_` (golang processes files in lexical order), but ensured
we don't depend on order.
* The command handling is spread in multiple packages making it a bit
less obvious how plugin starts are handled.
[1] drivers/shared/executor/libcontainer_nsenter_linux.go
[2] https://github.com/opencontainers/runc/tree/eb4aeed24ffbf8e2d740fafea39d91faa0ee84d0/libcontainer#using-libcontainer
2019-05-13 15:59:52 +00:00
|
|
|
"os"
|
2018-12-07 02:13:45 +00:00
|
|
|
"os/exec"
|
|
|
|
|
|
|
|
"github.com/golang/protobuf/ptypes"
|
|
|
|
hclog "github.com/hashicorp/go-hclog"
|
|
|
|
plugin "github.com/hashicorp/go-plugin"
|
|
|
|
"github.com/hashicorp/nomad/drivers/shared/executor/proto"
|
|
|
|
"github.com/hashicorp/nomad/plugins/base"
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
// ExecutorDefaultMaxPort is the default max port used by the executor for
|
|
|
|
// searching for an available port
|
|
|
|
ExecutorDefaultMaxPort = 14512
|
|
|
|
|
|
|
|
// ExecutorDefaultMinPort is the default min port used by the executor for
|
|
|
|
// searching for an available port
|
|
|
|
ExecutorDefaultMinPort = 14000
|
|
|
|
)
|
|
|
|
|
|
|
|
// CreateExecutor launches an executor plugin and returns an instance of the
|
|
|
|
// Executor interface
|
2019-01-09 23:06:58 +00:00
|
|
|
func CreateExecutor(logger hclog.Logger, driverConfig *base.ClientDriverConfig,
|
2018-12-07 02:13:45 +00:00
|
|
|
executorConfig *ExecutorConfig) (Executor, *plugin.Client, error) {
|
|
|
|
|
|
|
|
c, err := json.Marshal(executorConfig)
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("unable to create executor config: %v", err)
|
|
|
|
}
|
Use init to handle plugin invocation
Currently, nomad "plugin" processes (e.g. executor, logmon, docker_logger) are started as CLI
commands to be handled by command CLI framework. Plugin launchers use
`discover.NomadBinary()` to identify the binary and start it.
This has few downsides: The trivial one is that when running tests, one
must re-compile the nomad binary as the tests need to invoke the nomad
executable to start plugin. This is frequently overlooked, resulting in
puzzlement.
The more significant issue with `executor` in particular is in relation
to external driver:
* Plugin must identify the path of invoking nomad binary, which is not
trivial; `discvoer.NomadBinary()` now returns the path to the plugin
rather than to nomad, preventing external drivers from launching
executors.
* The external driver may get a different version of executor than it
expects (specially if we make a binary incompatible change in future).
This commit addresses both downside by having the plugin invocation
handling through an `init()` call, similar to how libcontainer init
handler is done in [1] and recommened by libcontainer [2]. `init()`
will be invoked and handled properly in tests and external drivers.
For external drivers, this change will cause external drivers to launch
the executor that's compiled against.
There a are a couple of downsides to this approach:
* These specific packages (i.e executor, logmon, and dockerlog) need to
be careful in use of `init()`, package initializers. Must avoid having
command execution rely on any other init in the package. I prefixed
files with `z_` (golang processes files in lexical order), but ensured
we don't depend on order.
* The command handling is spread in multiple packages making it a bit
less obvious how plugin starts are handled.
[1] drivers/shared/executor/libcontainer_nsenter_linux.go
[2] https://github.com/opencontainers/runc/tree/eb4aeed24ffbf8e2d740fafea39d91faa0ee84d0/libcontainer#using-libcontainer
2019-05-13 15:59:52 +00:00
|
|
|
bin, err := os.Executable()
|
2018-12-07 02:13:45 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("unable to find the nomad binary: %v", err)
|
|
|
|
}
|
|
|
|
|
2019-01-15 13:25:03 +00:00
|
|
|
p := &ExecutorPlugin{
|
|
|
|
logger: logger,
|
|
|
|
fsIsolation: executorConfig.FSIsolation,
|
|
|
|
}
|
|
|
|
|
2018-12-07 02:13:45 +00:00
|
|
|
config := &plugin.ClientConfig{
|
2019-01-09 23:06:58 +00:00
|
|
|
HandshakeConfig: base.Handshake,
|
2019-01-15 13:25:03 +00:00
|
|
|
Plugins: map[string]plugin.Plugin{"executor": p},
|
2019-01-09 23:06:58 +00:00
|
|
|
Cmd: exec.Command(bin, "executor", string(c)),
|
|
|
|
AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
|
|
|
|
Logger: logger.Named("executor"),
|
2018-12-07 02:13:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if driverConfig != nil {
|
|
|
|
config.MaxPort = driverConfig.ClientMaxPort
|
|
|
|
config.MinPort = driverConfig.ClientMinPort
|
|
|
|
} else {
|
|
|
|
config.MaxPort = ExecutorDefaultMaxPort
|
|
|
|
config.MinPort = ExecutorDefaultMinPort
|
|
|
|
}
|
|
|
|
|
|
|
|
// setting the setsid of the plugin process so that it doesn't get signals sent to
|
|
|
|
// the nomad client.
|
|
|
|
if config.Cmd != nil {
|
|
|
|
isolateCommand(config.Cmd)
|
|
|
|
}
|
|
|
|
|
2019-01-14 17:25:59 +00:00
|
|
|
return newExecutorClient(config, logger)
|
2018-12-07 02:13:45 +00:00
|
|
|
}
|
|
|
|
|
2019-01-14 17:25:59 +00:00
|
|
|
// ReattachToExecutor launches a plugin with a given plugin config
|
|
|
|
func ReattachToExecutor(reattachConfig *plugin.ReattachConfig, logger hclog.Logger) (Executor, *plugin.Client, error) {
|
|
|
|
config := &plugin.ClientConfig{
|
|
|
|
HandshakeConfig: base.Handshake,
|
|
|
|
Reattach: reattachConfig,
|
|
|
|
Plugins: GetPluginMap(logger, false),
|
|
|
|
AllowedProtocols: []plugin.Protocol{plugin.ProtocolGRPC},
|
|
|
|
Logger: logger.Named("executor"),
|
2019-01-15 13:25:03 +00:00
|
|
|
}
|
|
|
|
|
2019-01-14 17:25:59 +00:00
|
|
|
return newExecutorClient(config, logger)
|
|
|
|
}
|
2018-12-07 02:13:45 +00:00
|
|
|
|
2019-01-14 17:25:59 +00:00
|
|
|
// ReattachToPre09Executor creates a plugin client that reattaches to an existing
|
|
|
|
// pre 0.9 Nomad executor
|
|
|
|
func ReattachToPre09Executor(reattachConfig *plugin.ReattachConfig, logger hclog.Logger) (Executor, *plugin.Client, error) {
|
|
|
|
config := &plugin.ClientConfig{
|
|
|
|
HandshakeConfig: base.Handshake,
|
|
|
|
Reattach: reattachConfig,
|
|
|
|
Plugins: GetPre09PluginMap(logger, false),
|
|
|
|
AllowedProtocols: []plugin.Protocol{plugin.ProtocolNetRPC},
|
2019-01-09 23:06:58 +00:00
|
|
|
Logger: logger.Named("executor"),
|
|
|
|
}
|
2019-01-14 17:25:59 +00:00
|
|
|
return newExecutorClient(config, logger)
|
|
|
|
}
|
2018-12-07 02:13:45 +00:00
|
|
|
|
2019-01-14 17:25:59 +00:00
|
|
|
func newExecutorClient(config *plugin.ClientConfig, logger hclog.Logger) (Executor, *plugin.Client, error) {
|
2018-12-07 02:13:45 +00:00
|
|
|
executorClient := plugin.NewClient(config)
|
|
|
|
rpcClient, err := executorClient.Client()
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("error creating rpc client for executor plugin: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
raw, err := rpcClient.Dispense("executor")
|
|
|
|
if err != nil {
|
|
|
|
return nil, nil, fmt.Errorf("unable to dispense the executor plugin: %v", err)
|
|
|
|
}
|
|
|
|
executorPlugin, ok := raw.(Executor)
|
|
|
|
if !ok {
|
|
|
|
return nil, nil, fmt.Errorf("unexpected executor rpc type: %T", raw)
|
|
|
|
}
|
|
|
|
return executorPlugin, executorClient, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func processStateToProto(ps *ProcessState) (*proto.ProcessState, error) {
|
|
|
|
timestamp, err := ptypes.TimestampProto(ps.Time)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
pb := &proto.ProcessState{
|
|
|
|
Pid: int32(ps.Pid),
|
|
|
|
ExitCode: int32(ps.ExitCode),
|
|
|
|
Signal: int32(ps.Signal),
|
|
|
|
Time: timestamp,
|
|
|
|
}
|
|
|
|
|
|
|
|
return pb, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func processStateFromProto(pb *proto.ProcessState) (*ProcessState, error) {
|
|
|
|
timestamp, err := ptypes.Timestamp(pb.Time)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return &ProcessState{
|
|
|
|
Pid: int(pb.Pid),
|
|
|
|
ExitCode: int(pb.ExitCode),
|
|
|
|
Signal: int(pb.Signal),
|
|
|
|
Time: timestamp,
|
|
|
|
}, nil
|
|
|
|
}
|