Merge pull request #830 from grafana/refactor-chaos

Refactor chaos dir to stacktest dir

Author: Dieterbe

.circleci/config.yml

@@ -25,7 +25,7 @@ jobs:
       - image: circleci/golang:1.10
     steps:
       - checkout
-      - run: go test -v -race $(go list ./... | grep -v github.com/grafana/metrictank/chaos)
+      - run: go test -v -race $(go list ./... | grep -v github.com/grafana/metrictank/stacktest)
 
   qa:
     working_directory: /go/src/github.com/grafana/metrictank
@@ -50,7 +50,7 @@ jobs:
           at: .
       - run: scripts/qa/docs.sh
       - run: docker load -i build_docker/metrictank.tar
-      - run: scripts/qa/end2end.sh
+      - run: go test -v ./stacktest/tests/end2end_carbon
 
   deploy:
     docker:

chaos/ingest.go

@@ -26,9 +26,12 @@ cd $basedir/$env
 trap ctrl_c INT
 
 function ctrl_c() {
+    kill -INT "$child" 2>/dev/null
     docker-compose down
 }
 
 docker-compose down
 ../extra/populate-grafana.sh $PWD &
-docker-compose up --force-recreate
+docker-compose up --force-recreate &
+child=$!
+wait "$child"

docker/launch.sh

@@ -0,0 +1,3 @@
+here are various go tests that spin up metrictank via a docker stack and assert correct function
+
+see tests directory

scripts/qa/end2end.sh

@@ -1,4 +1,4 @@
-package chaos
+package docker
 
 import (
 	"context"
@@ -7,6 +7,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
+	"github.com/grafana/metrictank/stacktest/track"
 )
 
 var cli *client.Client
@@ -61,27 +62,27 @@ func stop(name string) error {
 }
 */
 
-// isolate isolates traffic between containers in setA and containers in setB
-func isolate(setA, setB []string, dur string) error {
+// Isolate isolates traffic between containers in setA and containers in setB
+func Isolate(setA, setB []string, dur string) error {
 	// note: isolateOut should return very fast (order of ms)
 	// so we can run all this in serial
 	for _, a := range setA {
-		err := isolateOut(a, dur, setB...)
+		err := IsolateOut(a, dur, setB...)
 		if err != nil {
 			return err
 		}
 	}
 	for _, b := range setB {
-		err := isolateOut(b, dur, setA...)
+		err := IsolateOut(b, dur, setA...)
 		if err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-// isolateOut isolates traffic from the given docker container to all others matching the expression
-func isolateOut(name, dur string, targets ...string) error {
+// IsolateOut isolates traffic from the given docker container to all others matching the expression
+func IsolateOut(name, dur string, targets ...string) error {
 	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{})
 	if err != nil {
 		return err
@@ -108,7 +109,7 @@ func isolateOut(name, dur string, targets ...string) error {
 	}
 
 	// log all pumba's output
-	_, err = NewTracker(cmd, false, false, "pumba-stdout", "pumba-stderr")
+	_, err = track.NewTracker(cmd, false, false, "pumba-stdout", "pumba-stderr")
 	if err != nil {
 		return err
 	}

scripts/qa/generate_test_data.sh

@@ -1,4 +1,4 @@
-package chaos
+package docker
 
 import (
 	"os"
@@ -10,7 +10,7 @@ import (
 
 // path takes a relative path within the metrictank repository and returns the full absolute filepath,
 // assuming metrictank repo is in the first directory specified in GOPATH
-func path(dst string) string {
+func Path(dst string) string {
 	gopath := os.Getenv("GOPATH")
 	if gopath == "" {
 		var err error