luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Export DockerHandle and change tests to use DockerHandle.ContainerID()

This commit is contained in:
Chris Bednarski 2015-11-19 14:20:41 -08:00
parent 6253b1d0aa
commit b9b786732e
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/driver/docker.go
View File

@ -66,7 +66,7 @@ type dockerPID struct {
ContainerID string
}
type dockerHandle struct {
type DockerHandle struct {
client *docker.Client
logger *log.Logger
cleanupContainer bool
@ -463,7 +463,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
d.logger.Printf("[INFO] driver.docker: started container %s", container.ID)
// Return a driver handle
h := &dockerHandle{
h := &DockerHandle{
client: client,
cleanupContainer: cleanupContainer,
cleanupImage: cleanupImage,
@ -516,7 +516,7 @@ func (d *DockerDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, er
}
// Return a driver handle
h := &dockerHandle{
h := &DockerHandle{
client: client,
cleanupContainer: cleanupContainer,
cleanupImage: cleanupImage,
@ -530,7 +530,7 @@ func (d *DockerDriver) Open(ctx *ExecContext, handleID string) (DriverHandle, er
return h, nil
}
func (h *dockerHandle) ID() string {
func (h *DockerHandle) ID() string {
// Return a handle to the PID
pid := dockerPID{
ImageID: h.imageID,
@ -543,21 +543,21 @@ func (h *dockerHandle) ID() string {
return fmt.Sprintf("DOCKER:%s", string(data))
}
func (h *dockerHandle) ContainerID() string {
func (h *DockerHandle) ContainerID() string {
return h.containerID
}
func (h *dockerHandle) WaitCh() chan *cstructs.WaitResult {
func (h *DockerHandle) WaitCh() chan *cstructs.WaitResult {
return h.waitCh
}
func (h *dockerHandle) Update(task *structs.Task) error {
func (h *DockerHandle) Update(task *structs.Task) error {
// Update is not possible
return nil
}
// Kill is used to terminate the task. This uses docker stop -t 5
func (h *dockerHandle) Kill() error {
func (h *DockerHandle) Kill() error {
// Stop the container
err := h.client.StopContainer(h.containerID, 5)
if err != nil {
@ -608,7 +608,7 @@ func (h *dockerHandle) Kill() error {
return nil
}
func (h *dockerHandle) run() {
func (h *DockerHandle) run() {
// Wait for it...
exitCode, err := h.client.WaitContainer(h.containerID)
if err != nil {

23
client/driver/docker_test.go
View File

@ -1,12 +1,10 @@
package driver
import (
"encoding/json"
"fmt"
"io/ioutil"
"path/filepath"
"reflect"
"strings"
"testing"
"time"
@ -57,7 +55,7 @@ func dockerIsRemote(t *testing.T) bool {
}
func TestDockerDriver_Handle(t *testing.T) {
h := &dockerHandle{
h := &DockerHandle{
imageID: "imageid",
containerID: "containerid",
doneCh: make(chan struct{}),
@ -478,15 +476,7 @@ func TestDockerLabels(t *testing.T) {
t.Fatalf("err: %v", err)
}
// don't know if is queriable in a clean way
parts := strings.SplitN(handle.ID(), ":", 2)
var pid dockerPID
err = json.Unmarshal([]byte(parts[1]), &pid)
if err != nil {
t.Fatalf("err: %v", err)
}
container, err := client.InspectContainer(pid.ContainerID)
container, err := client.InspectContainer(handle.(*DockerHandle).ContainerID())
if err != nil {
t.Fatalf("err: %v", err)
}
@ -529,14 +519,7 @@ func TestDockerDNS(t *testing.T) {
}
// don't know if is queriable in a clean way
parts := strings.SplitN(handle.ID(), ":", 2)
var pid dockerPID
err = json.Unmarshal([]byte(parts[1]), &pid)
if err != nil {
t.Fatalf("err: %v", err)
}
container, err := client.InspectContainer(pid.ContainerID)
container, err := client.InspectContainer(handle.(*DockerHandle).ContainerID())
if err != nil {
t.Fatalf("err: %v", err)
}