[dtest] Run tests on an existing cluster launched with docker compose

scripts/dtest/docker-compose.yml

@@ -0,0 +1,24 @@
+version: "3.5"
+services:
+  dbnode01:
+    networks:
+      - dtest
+    image: m3dbnode:dev
+    container_name: dbnode01
+    ports:
+      - "0.0.0.0:2379:2379"
+      - "0.0.0.0:9000:9000"
+    volumes:
+      - "./m3dbnode.yml:/etc/m3dbnode/m3dbnode.yml"
+  coord01:
+    networks:
+      - dtest
+    image: m3coordinator:dev
+    container_name: coord01
+    ports:
+      - "0.0.0.0:7201:7201"
+      - "0.0.0.0:7204:7204"
+    volumes:
+      - "./m3coordinator.yml:/etc/m3coordinator/m3coordinator.yml"
+networks:
+  dtest:

scripts/dtest/run.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -ex
+set -o pipefail
+
+COMPOSE_FILE=./scripts/dtest/docker-compose.yml
+
+function defer {
+  docker-compose -f "${COMPOSE_FILE}" down
+}
+
+trap defer EXIT
+
+docker-compose -f "${COMPOSE_FILE}" up --detach
+
+go test -v -tags=dtest ./src/cmd/tools/dtest/docker/harness

src/cmd/tools/dtest/docker/harness/harness_test.go

@@ -34,20 +34,20 @@ var singleDBNodeDockerResources resources.DockerResources
 
 func TestMain(m *testing.M) {
 	var err error
-	singleDBNodeDockerResources, err = resources.SetupSingleM3DBNode()
+	singleDBNodeDockerResources, err = resources.SetupSingleM3DBNode(
+		resources.WithExistingCluster("dbnode01", "coord01"),
+	)
 
 	if err != nil {
 		fmt.Println("could not set up db docker containers", err)
 		os.Exit(1)
 	}
 
 	if l := len(singleDBNodeDockerResources.Nodes()); l != 1 {
-		singleDBNodeDockerResources.Cleanup() //nolint:errcheck
 		fmt.Println("should only have a single node, have", l)
 		os.Exit(1)
 	}
 
 	code := m.Run()
-	singleDBNodeDockerResources.Cleanup() //nolint:errcheck
 	os.Exit(code)
 }

src/cmd/tools/dtest/docker/harness/resources/common.go

@@ -26,7 +26,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"os"
 
 	"github.com/m3db/m3/src/x/instrument"
 
@@ -52,7 +51,6 @@ type dockerResourceOptions struct {
 	source           string
 	containerName    string
 	image            dockerImage
-	dockerFile       string
 	portList         []int
 	mounts           []string
 	iOpts            instrument.Options
@@ -77,10 +75,6 @@ func (o dockerResourceOptions) withDefaults(
 		o.image = defaultOpts.image
 	}
 
-	if len(o.dockerFile) == 0 {
-		o.dockerFile = defaultOpts.dockerFile
-	}
-
 	if len(o.portList) == 0 {
 		o.portList = defaultOpts.portList
 	}
@@ -117,6 +111,7 @@ func setupNetwork(pool *dockertest.Pool) error {
 
 	for _, n := range networks {
 		if n.Name == networkName {
+			return nil
 			if err := pool.Client.RemoveNetwork(networkName); err != nil {
 				return err
 			}
@@ -176,11 +171,6 @@ func exposePorts(
 	return opts
 }
 
-func getDockerfile(file string) string {
-	src, _ := os.Getwd()
-	return fmt.Sprintf("%s/%s", src, file)
-}
-
 func toResponse(
 	resp *http.Response,
 	response proto.Message,

src/cmd/tools/dtest/docker/harness/resources/coordinator.go

@@ -42,9 +42,8 @@ import (
 )
 
 const (
-	defaultCoordinatorSource     = "coordinator"
-	defaultCoordinatorName       = "coord01"
-	defaultCoordinatorDockerfile = "resources/config/m3coordinator.Dockerfile"
+	defaultCoordinatorSource = "coordinator"
+	defaultCoordinatorName   = "coord01"
 )
 
 var (
@@ -53,7 +52,6 @@ var (
 	defaultCoordinatorOptions = dockerResourceOptions{
 		source:        defaultCoordinatorSource,
 		containerName: defaultCoordinatorName,
-		dockerFile:    defaultCoordinatorDockerfile,
 		portList:      defaultCoordinatorList,
 	}
 )

src/cmd/tools/dtest/docker/harness/resources/dbnode.go

@@ -36,7 +36,6 @@ import (
 const (
 	defaultDBNodeSource        = "dbnode"
 	defaultDBNodeContainerName = "dbnode01"
-	defaultDBNodeDockerfile    = "resources/config/m3dbnode.Dockerfile"
 )
 
 var (
@@ -45,7 +44,6 @@ var (
 	defaultDBNodeOptions = dockerResourceOptions{
 		source:        defaultDBNodeSource,
 		containerName: defaultDBNodeContainerName,
-		dockerFile:    getDockerfile(defaultDBNodeDockerfile),
 		portList:      defaultDBNodePortList,
 	}
 )

src/cmd/tools/dtest/docker/harness/resources/docker_resource.go

@@ -50,7 +50,6 @@ func newDockerResource(
 		source        = resourceOpts.source
 		image         = resourceOpts.image
 		containerName = resourceOpts.containerName
-		dockerFile    = resourceOpts.dockerFile
 		iOpts         = resourceOpts.iOpts
 		portList      = resourceOpts.portList
 
@@ -60,11 +59,6 @@ func newDockerResource(
 		)
 	)
 
-	if err := pool.RemoveContainerByName(containerName); err != nil {
-		logger.Error("could not remove container from pool", zap.Error(err))
-		return nil, err
-	}
-
 	opts := exposePorts(newOptions(containerName), portList)
 
 	hostConfigOpts := func(c *dc.HostConfig) {
@@ -83,9 +77,13 @@ func newDockerResource(
 	var resource *dockertest.Resource
 	var err error
 	if image.name == "" {
-		logger.Info("building and running container with options",
-			zap.String("dockerFile", dockerFile), zap.Any("options", opts))
-		resource, err = pool.BuildAndRunWithOptions(dockerFile, opts, hostConfigOpts)
+		logger.Info("connecting to existing container", zap.String("container", containerName))
+		var ok bool
+		resource, ok = pool.ContainerByName(containerName)
+		if !ok {
+			logger.Error("could not find container", zap.Error(err))
+			return nil, fmt.Errorf("could not find container %v", containerName)
+		}
 	} else {
 		opts = useImage(opts, image)
 		imageWithTag := fmt.Sprintf("%v:%v", image.name, image.tag)

src/cmd/tools/dtest/docker/harness/resources/harness.go

@@ -77,20 +77,22 @@ func SetupSingleM3DBNode(opts ...SetupOptions) (DockerResources, error) { // nol
 	}
 
 	pool.MaxWait = timeout
-	err = setupNetwork(pool)
-	if err != nil {
-		return nil, err
-	}
 
-	err = setupVolume(pool)
-	if err != nil {
-		return nil, err
+	if !options.existingCluster {
+		if err := setupNetwork(pool); err != nil {
+			return nil, err
+		}
+
+		if err := setupVolume(pool); err != nil {
+			return nil, err
+		}
 	}
 
 	iOpts := instrument.NewOptions()
 	dbNode, err := newDockerHTTPNode(pool, dockerResourceOptions{
-		image: options.dbNodeImage,
-		iOpts: iOpts,
+		image:         options.dbNodeImage,
+		containerName: options.dbNodeContainerName,
+		iOpts:         iOpts,
 	})
 
 	success := false
@@ -112,8 +114,9 @@ func SetupSingleM3DBNode(opts ...SetupOptions) (DockerResources, error) { // nol
 	}
 
 	coordinator, err := newDockerHTTPCoordinator(pool, dockerResourceOptions{
-		image: options.coordinatorImage,
-		iOpts: iOpts,
+		image:         options.coordinatorImage,
+		containerName: options.coordinatorContainerName,
+		iOpts:         iOpts,
 	})
 
 	defer func() {

src/cmd/tools/dtest/docker/harness/resources/options.go

@@ -28,6 +28,10 @@ type dockerImage struct {
 type setupOptions struct {
 	dbNodeImage      dockerImage
 	coordinatorImage dockerImage
+
+	existingCluster          bool
+	dbNodeContainerName      string
+	coordinatorContainerName string
 }
 
 // SetupOptions is a setup option.
@@ -46,3 +50,13 @@ func WithCoordinatorImage(name, tag string) SetupOptions {
 		o.coordinatorImage = dockerImage{name: name, tag: tag}
 	}
 }
+
+// WithExistingCluster sets the names of already running containers dbnode and coordinator
+// containers that should be used for tests.
+func WithExistingCluster(dbNodeContainerName, coordinatorContainerName string) SetupOptions {
+	return func(o *setupOptions) {
+		o.existingCluster = true
+		o.dbNodeContainerName = dbNodeContainerName
+		o.coordinatorContainerName = coordinatorContainerName
+	}
+}