Merge branch 'master' of github.com:hashicorp/nomad

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.3.0 (UNRELEASED)
+## 0.3.0
 
 __BACKWARDS INCOMPATIBILITIES:__
   * Stdout and Stderr log files of tasks have moved from task/local to

client/alloc_runner.go

@@ -66,6 +66,7 @@ type AllocRunner struct {
 
 // allocRunnerState is used to snapshot the state of the alloc runner
 type allocRunnerState struct {
+	Version                string
 	Alloc                  *structs.Allocation
 	AllocClientStatus      string
 	AllocClientDescription string
@@ -181,6 +182,7 @@ func (r *AllocRunner) saveAllocRunnerState() error {
 	r.ctxLock.Unlock()
 
 	snap := allocRunnerState{
+		Version:                r.config.Version,
 		Alloc:                  alloc,
 		Context:                ctx,
 		AllocClientStatus:      allocClientStatus,

client/config/config.go

@@ -70,6 +70,9 @@ type Config struct {
 	//
 	//	namespace.option = value
 	Options map[string]string
+
+	// Version is the version of the Nomad client
+	Version string
 }
 
 func (c *Config) Copy() *Config {

client/driver/docker.go

@@ -74,6 +74,7 @@ func (c *DockerDriverConfig) Validate() error {
 }
 
 type dockerPID struct {
+	Version      string
 	ImageID      string
 	ContainerID  string
 	KillTimeout  time.Duration
@@ -89,6 +90,7 @@ type DockerHandle struct {
 	cleanupImage     bool
 	imageID          string
 	containerID      string
+	version          string
 	killTimeout      time.Duration
 	waitCh           chan *cstructs.WaitResult
 	doneCh           chan struct{}
@@ -605,6 +607,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
 		logger:           d.logger,
 		imageID:          dockerImage.ID,
 		containerID:      container.ID,
+		version:          d.config.Version,
 		killTimeout:      d.DriverContext.KillTimeout(task),
 		doneCh:           make(chan struct{}),
 		waitCh:           make(chan *cstructs.WaitResult, 1),
@@ -672,6 +675,7 @@ func (d *DockerDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, er
 		logger:           d.logger,
 		imageID:          pid.ImageID,
 		containerID:      pid.ContainerID,
+		version:          pid.Version,
 		killTimeout:      pid.KillTimeout,
 		doneCh:           make(chan struct{}),
 		waitCh:           make(chan *cstructs.WaitResult, 1),
@@ -683,6 +687,7 @@ func (d *DockerDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, er
 func (h *DockerHandle) ID() string {
 	// Return a handle to the PID
 	pid := dockerPID{
+		Version:      h.version,
 		ImageID:      h.imageID,
 		ContainerID:  h.containerID,
 		KillTimeout:  h.killTimeout,

client/driver/docker_test.go

@@ -152,6 +152,7 @@ func TestDockerDriver_Handle(t *testing.T) {
 	defer pluginClient.Kill()
 
 	h := &DockerHandle{
+		version:      "version",
 		imageID:      "imageid",
 		logCollector: logCollector,
 		pluginClient: pluginClient,
@@ -162,7 +163,7 @@ func TestDockerDriver_Handle(t *testing.T) {
 	}
 
 	actual := h.ID()
-	expected := fmt.Sprintf("DOCKER:{\"ImageID\":\"imageid\",\"ContainerID\":\"containerid\",\"KillTimeout\":5,\"PluginConfig\":{\"Pid\":%d,\"AddrNet\":\"unix\",\"AddrName\":\"%s\"}}",
+	expected := fmt.Sprintf("DOCKER:{\"Version\":\"version\",\"ImageID\":\"imageid\",\"ContainerID\":\"containerid\",\"KillTimeout\":5,\"PluginConfig\":{\"Pid\":%d,\"AddrNet\":\"unix\",\"AddrName\":\"%s\"}}",
 		pluginClient.ReattachConfig().Pid, pluginClient.ReattachConfig().Addr.String())
 	if actual != expected {
 		t.Errorf("Expected `%s`, found `%s`", expected, actual)

client/driver/exec.go

@@ -45,6 +45,7 @@ type execHandle struct {
 	logger          *log.Logger
 	waitCh          chan *cstructs.WaitResult
 	doneCh          chan struct{}
+	version         string
 }
 
 // NewExecDriver is used to create a new exec driver
@@ -141,6 +142,7 @@ func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 		isolationConfig: ps.IsolationConfig,
 		killTimeout:     d.DriverContext.KillTimeout(task),
 		logger:          d.logger,
+		version:         d.config.Version,
 		doneCh:          make(chan struct{}),
 		waitCh:          make(chan *cstructs.WaitResult, 1),
 	}
@@ -149,6 +151,7 @@ func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 }
 
 type execId struct {
+	Version         string
 	KillTimeout     time.Duration
 	UserPid         int
 	TaskDir         string
@@ -193,6 +196,7 @@ func (d *ExecDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, erro
 		allocDir:        id.AllocDir,
 		isolationConfig: id.IsolationConfig,
 		logger:          d.logger,
+		version:         id.Version,
 		killTimeout:     id.KillTimeout,
 		doneCh:          make(chan struct{}),
 		waitCh:          make(chan *cstructs.WaitResult, 1),
@@ -203,6 +207,7 @@ func (d *ExecDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, erro
 
 func (h *execHandle) ID() string {
 	id := execId{
+		Version:         h.version,
 		KillTimeout:     h.killTimeout,
 		PluginConfig:    NewPluginReattachConfig(h.pluginClient.ReattachConfig()),
 		UserPid:         h.userPid,

client/driver/java.go

@@ -50,6 +50,7 @@ type javaHandle struct {
 	taskDir     string
 	allocDir    *allocdir.AllocDir
 	killTimeout time.Duration
+	version     string
 	logger      *log.Logger
 	waitCh      chan *cstructs.WaitResult
 	doneCh      chan struct{}
@@ -189,6 +190,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 		taskDir:         taskDir,
 		allocDir:        ctx.AllocDir,
 		killTimeout:     d.DriverContext.KillTimeout(task),
+		version:         d.config.Version,
 		logger:          d.logger,
 		doneCh:          make(chan struct{}),
 		waitCh:          make(chan *cstructs.WaitResult, 1),
@@ -206,6 +208,7 @@ func (d *JavaDriver) cgroupsMounted(node *structs.Node) bool {
 }
 
 type javaId struct {
+	Version         string
 	KillTimeout     time.Duration
 	PluginConfig    *PluginReattachConfig
 	IsolationConfig *cstructs.IsolationConfig
@@ -252,6 +255,7 @@ func (d *JavaDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, erro
 		taskDir:         id.TaskDir,
 		allocDir:        id.AllocDir,
 		logger:          d.logger,
+		version:         id.Version,
 		killTimeout:     id.KillTimeout,
 		doneCh:          make(chan struct{}),
 		waitCh:          make(chan *cstructs.WaitResult, 1),
@@ -263,6 +267,7 @@ func (d *JavaDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, erro
 
 func (h *javaHandle) ID() string {
 	id := javaId{
+		Version:         h.version,
 		KillTimeout:     h.killTimeout,
 		PluginConfig:    NewPluginReattachConfig(h.pluginClient.ReattachConfig()),
 		UserPid:         h.userPid,

client/driver/qemu.go

@@ -50,6 +50,7 @@ type qemuHandle struct {
 	allocDir     *allocdir.AllocDir
 	killTimeout  time.Duration
 	logger       *log.Logger
+	version      string
 	waitCh       chan *cstructs.WaitResult
 	doneCh       chan struct{}
 }
@@ -224,6 +225,7 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 		userPid:      ps.Pid,
 		allocDir:     ctx.AllocDir,
 		killTimeout:  d.DriverContext.KillTimeout(task),
+		version:      d.config.Version,
 		logger:       d.logger,
 		doneCh:       make(chan struct{}),
 		waitCh:       make(chan *cstructs.WaitResult, 1),
@@ -234,6 +236,7 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle,
 }
 
 type qemuId struct {
+	Version      string
 	KillTimeout  time.Duration
 	UserPid      int
 	PluginConfig *PluginReattachConfig
@@ -267,6 +270,7 @@ func (d *QemuDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, erro
 		allocDir:     id.AllocDir,
 		logger:       d.logger,
 		killTimeout:  id.KillTimeout,
+		version:      id.Version,
 		doneCh:       make(chan struct{}),
 		waitCh:       make(chan *cstructs.WaitResult, 1),
 	}
@@ -276,6 +280,7 @@ func (d *QemuDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, erro
 
 func (h *qemuHandle) ID() string {
 	id := qemuId{
+		Version:      h.version,
 		KillTimeout:  h.killTimeout,
 		PluginConfig: NewPluginReattachConfig(h.pluginClient.ReattachConfig()),
 		UserPid:      h.userPid,

client/driver/raw_exec.go

@@ -35,6 +35,7 @@ type RawExecDriver struct {
 
 // rawExecHandle is returned from Start/Open as a handle to the PID
 type rawExecHandle struct {
+	version      string
 	pluginClient *plugin.Client
 	userPid      int
 	executor     executor.Executor
@@ -130,6 +131,7 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl
 		userPid:      ps.Pid,
 		killTimeout:  d.DriverContext.KillTimeout(task),
 		allocDir:     ctx.AllocDir,
+		version:      d.config.Version,
 		logger:       d.logger,
 		doneCh:       make(chan struct{}),
 		waitCh:       make(chan *cstructs.WaitResult, 1),
@@ -139,6 +141,7 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl
 }
 
 type rawExecId struct {
+	Version      string
 	KillTimeout  time.Duration
 	UserPid      int
 	PluginConfig *PluginReattachConfig
@@ -171,6 +174,7 @@ func (d *RawExecDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, e
 		logger:       d.logger,
 		killTimeout:  id.KillTimeout,
 		allocDir:     id.AllocDir,
+		version:      id.Version,
 		doneCh:       make(chan struct{}),
 		waitCh:       make(chan *cstructs.WaitResult, 1),
 	}
@@ -180,6 +184,7 @@ func (d *RawExecDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, e
 
 func (h *rawExecHandle) ID() string {
 	id := rawExecId{
+		Version:      h.version,
 		KillTimeout:  h.killTimeout,
 		PluginConfig: NewPluginReattachConfig(h.pluginClient.ReattachConfig()),
 		UserPid:      h.userPid,

client/task_runner.go

@@ -56,6 +56,7 @@ type TaskRunner struct {
 
 // taskRunnerState is used to snapshot the state of the task runner
 type taskRunnerState struct {
+	Version  string
 	Task     *structs.Task
 	HandleID string
 }
@@ -153,7 +154,8 @@ func (r *TaskRunner) RestoreState() error {
 // SaveState is used to snapshot our state
 func (r *TaskRunner) SaveState() error {
 	snap := taskRunnerState{
-		Task: r.task,
+		Task:    r.task,
+		Version: r.config.Version,
 	}
 	r.handleLock.Lock()
 	if r.handle != nil {

command/agent/agent.go

@@ -214,6 +214,7 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
 		httpAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
 	}
 	conf.Node.HTTPAddr = httpAddr
+	conf.Version = a.config.Version
 	return conf, nil
 }
 

version.go

@@ -10,4 +10,4 @@ const Version = "0.3.0"
 // A pre-release marker for the version. If this is "" (empty string)
 // then it means that it is a final release. Otherwise, this is a pre-release
 // such as "dev" (in development), "beta", "rc1", etc.
-const VersionPrerelease = "rc2"
+const VersionPrerelease = ""