Docker driver plugin

client/allocrunner/taskrunner/task_runner.go

@@ -369,6 +369,9 @@ MAIN:
 				select {
 				case result = <-resultCh:
 					// WaitCh returned a result
+					if result != nil {
+						tr.handleTaskExitResult(result)
+					}
 				case <-tr.ctx.Done():
 					// TaskRunner was told to exit immediately
 					return
@@ -410,6 +413,7 @@ MAIN:
 		event := structs.NewTaskEvent(structs.TaskTerminated).
 			SetExitCode(result.ExitCode).
 			SetSignal(result.Signal).
+			SetOOMKilled(result.OOMKilled).
 			SetExitMessage(result.Err)
 		tr.UpdateState(structs.TaskStateDead, event)
 	}
@@ -422,6 +426,20 @@ MAIN:
 	tr.logger.Debug("task run loop exiting")
 }
 
+func (tr *TaskRunner) handleTaskExitResult(result *drivers.ExitResult) {
+	event := structs.NewTaskEvent(structs.TaskTerminated).
+		SetExitCode(result.ExitCode).
+		SetSignal(result.Signal).
+		SetOOMKilled(result.OOMKilled).
+		SetExitMessage(result.Err)
+
+	tr.EmitEvent(event)
+
+	if !tr.clientConfig.DisableTaggedMetrics {
+		metrics.IncrCounterWithLabels([]string{"client", "allocs", "oom_killed"}, 1, tr.baseLabels)
+	}
+}
+
 // handleUpdates runs update hooks when triggerUpdateCh is ticked and exits
 // when Run has returned. Should only be run in a goroutine from Run.
 func (tr *TaskRunner) handleUpdates() {
@@ -650,12 +668,17 @@ func (tr *TaskRunner) persistLocalState() error {
 // buildTaskConfig builds a drivers.TaskConfig with an unique ID for the task.
 // The ID is consistently built from the alloc ID, task name and restart attempt.
 func (tr *TaskRunner) buildTaskConfig() *drivers.TaskConfig {
+
 	return &drivers.TaskConfig{
 		ID:   fmt.Sprintf("%s/%s/%d", tr.allocID, tr.taskName, tr.restartTracker.GetCount()),
 		Name: tr.task.Name,
 		Resources: &drivers.Resources{
 			NomadResources: tr.task.Resources,
-			//TODO Calculate the LinuxResources
+			LinuxResources: &drivers.LinuxResources{
+				MemoryLimitBytes: int64(tr.Task().Resources.MemoryMB) * 1024 * 1024,
+				CPUShares:        int64(tr.Task().Resources.CPU),
+				PercentTicks:     float64(tr.task.Resources.CPU) / float64(tr.clientConfig.Node.Resources.CPU),
+			},
 		},
 		Env:        tr.envBuilder.Build().Map(),
 		User:       tr.task.User,

command/commands.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/hashicorp/nomad/command/agent"
+	"github.com/hashicorp/nomad/drivers/docker/docklog"
 	"github.com/hashicorp/nomad/version"
 	"github.com/mitchellh/cli"
 )
@@ -210,6 +211,11 @@ func Commands(metaPtr *Meta, agentUi cli.Ui) map[string]cli.CommandFactory {
 				Meta: meta,
 			}, nil
 		},
+		docklog.PluginName: func() (cli.Command, error) {
+			return &DockerLoggerPluginCommand{
+				Meta: meta,
+			}, nil
+		},
 		"eval": func() (cli.Command, error) {
 			return &EvalCommand{
 				Meta: meta,

command/docker_logger_plugin.go

@@ -0,0 +1,36 @@
+package command
+
+import (
+	"strings"
+
+	hclog "github.com/hashicorp/go-hclog"
+	plugin "github.com/hashicorp/go-plugin"
+	"github.com/hashicorp/nomad/drivers/docker/docklog"
+	"github.com/hashicorp/nomad/plugins/base"
+)
+
+type DockerLoggerPluginCommand struct {
+	Meta
+}
+
+func (e *DockerLoggerPluginCommand) Help() string {
+	helpText := `
+	This is a command used by Nomad internally to launch the docker logger process"
+	`
+	return strings.TrimSpace(helpText)
+}
+
+func (e *DockerLoggerPluginCommand) Synopsis() string {
+	return "internal - launch a docker logger plugin"
+}
+
+func (e *DockerLoggerPluginCommand) Run(args []string) int {
+	plugin.Serve(&plugin.ServeConfig{
+		HandshakeConfig: base.Handshake,
+		Plugins: map[string]plugin.Plugin{
+			docklog.PluginName: docklog.NewPlugin(docklog.NewDockerLogger(hclog.Default().Named(docklog.PluginName))),
+		},
+		GRPCServer: plugin.DefaultGRPCServer,
+	})
+	return 0
+}