Merge "Tests for compiler/jobqueue."
diff --git a/go/src/playground/Dockerfile b/go/src/playground/Dockerfile
index 8f28b40..832f55e 100644
--- a/go/src/playground/Dockerfile
+++ b/go/src/playground/Dockerfile
@@ -34,28 +34,21 @@
WORKDIR /home/playground
RUN npm install --production $VANADIUM_ROOT/release/javascript/core
-# Install Vanadium Go dependencies.
-WORKDIR $VANADIUM_ROOT/release
-RUN v23 go install v.io/x/ref/...
-RUN v23 go install playground/...
+# Install builder and dependencies.
+WORKDIR $VANADIUM_ROOT/release/projects/playground/go/src/playground
+RUN make all
# Uncomment the following lines to install a version of the builder tool using
# your local version of the code. This is useful when developing and testing
# local changes.
#RUN rm -f $VANADIUM_ROOT/release/projects/playground/go/bin/builder
+#RUN rm -rf $VANADIUM_ROOT/release/projects/playground/go/src/playground/Makefile
#RUN rm -rf $VANADIUM_ROOT/release/projects/playground/go/src/playground/builder/
#RUN rm -rf $VANADIUM_ROOT/release/projects/playground/go/src/playground/lib/
+#ADD Makefile $VANADIUM_ROOT/release/projects/playground/go/src/playground/Makefile
#ADD builder/ $VANADIUM_ROOT/release/projects/playground/go/src/playground/builder/
#ADD lib/ $VANADIUM_ROOT/release/projects/playground/go/src/playground/lib/
-#RUN v23 go install playground/builder/...
-
-# Copy proxyd's main.go to ./proxyd_main.go, then uncomment the following
-# lines to install a version of proxyd (used by the builder tool) using your
-# local version of the code. This is useful when developing and testing local
-# changes.
-#RUN rm -f $VANADIUM_ROOT/release/go/bin/proxyd
-#ADD proxyd_main.go $VANADIUM_ROOT/release/go/src/v.io/x/ref/services/proxy/proxyd/main.go
-#RUN v23 go install v.io/x/ref/services/proxy/proxyd
+#RUN make builder
USER playground
WORKDIR /home/playground
diff --git a/go/src/playground/Makefile b/go/src/playground/Makefile
index 4fabbb8..b3107de 100644
--- a/go/src/playground/Makefile
+++ b/go/src/playground/Makefile
@@ -11,8 +11,24 @@
.DELETE_ON_ERROR:
.PHONY: all
-all:
- v23 go install playground/...
+all: builder compilerd
+
+# builder-deps target builds the binaries that the builder calls.
+.PHONY: builder-deps
+builder-deps:
+ v23 go install v.io/x/ref/cmd/principal
+ v23 go install v.io/x/ref/services/identity/identityd
+ v23 go install v.io/x/ref/services/mounttable/mounttabled
+ v23 go install v.io/x/ref/services/proxy/proxyd
+ v23 go install v.io/x/ref/services/wsprd
+
+.PHONY: builder
+builder: builder-deps
+ v23 go install playground/builder
+
+.PHONY: compilerd
+compilerd:
+ v23 go install playground/compilerd
.PHONY: start
start: config/db.json all
diff --git a/go/src/playground/README.md b/go/src/playground/README.md
index 0cab349..a9934ac 100644
--- a/go/src/playground/README.md
+++ b/go/src/playground/README.md
@@ -57,7 +57,6 @@
Or, run it without Docker (for faster iterations during development):
- $ cd $(mktemp -d "/tmp/XXXXXXXX")
$ PATH=$VANADIUM_ROOT/release/go/bin:$VANADIUM_ROOT/release/projects/playground/go/bin:$PATH compilerd --listen-timeout=0 --address=localhost:8181 --use-docker=false
The server should now be running at http://localhost:8181 and responding to
diff --git a/go/src/playground/compilerd/jobqueue/jobqueue.go b/go/src/playground/compilerd/jobqueue/jobqueue.go
index e9e3145..9c3a195 100644
--- a/go/src/playground/compilerd/jobqueue/jobqueue.go
+++ b/go/src/playground/compilerd/jobqueue/jobqueue.go
@@ -26,7 +26,9 @@
import (
"bytes"
"fmt"
+ "io/ioutil"
"log"
+ "os"
"os/exec"
"sync"
"time"
@@ -65,8 +67,8 @@
cancelled bool
}
-func NewJob(body []byte, res *event.ResponseEventSink, maxSize int, maxTime time.Duration, useDocker bool, dockerMem int) job {
- return job{
+func NewJob(body []byte, res *event.ResponseEventSink, maxSize int, maxTime time.Duration, useDocker bool, dockerMem int) *job {
+ return &job{
id: <-uniq,
body: body,
res: res,
@@ -91,7 +93,7 @@
}
type Dispatcher struct {
- jobQueue chan job
+ jobQueue chan *job
// A message sent on the stopped channel causes the dispatcher to stop
// assigning new jobs to workers.
@@ -104,7 +106,7 @@
func NewDispatcher(workers int, jobQueueCap int) *Dispatcher {
d := &Dispatcher{
- jobQueue: make(chan job, jobQueueCap),
+ jobQueue: make(chan *job, jobQueueCap),
stopped: make(chan bool),
}
@@ -144,16 +146,18 @@
cancelled := job.cancelled
job.mu.Unlock()
if cancelled {
- log.Printf("Dispatcher encountered cancelled job %v, rejecting.", job.id)
+ log.Printf("Dispatcher encountered cancelled job %v, rejecting.\n", job.id)
job.resultChan <- result{
Success: false,
Events: nil,
}
+ workerQueue <- worker
} else {
log.Printf("Dispatching job %v to worker %v.\n", job.id, worker.id)
d.wg.Add(1)
go func() {
job.resultChan <- worker.run(job)
+ log.Printf("Job %v finished on worker %v.\n", job.id, worker.id)
d.wg.Done()
workerQueue <- worker
}()
@@ -198,7 +202,7 @@
// Enqueue queues a job to be run be the next available worker. It returns a
// channel on which the job's results will be published.
-func (d *Dispatcher) Enqueue(j job) (chan result, error) {
+func (d *Dispatcher) Enqueue(j *job) (chan result, error) {
select {
case d.jobQueue <- j:
return j.resultChan, nil
@@ -224,7 +228,7 @@
// run compiles and runs a job, caches the result, and returns the result on
// the job's result channel.
-func (w *worker) run(j job) result {
+func (w *worker) run(j *job) result {
event.Debug(j.res, "Preparing to run program")
memoryFlag := fmt.Sprintf("%dm", j.dockerMem)
@@ -248,7 +252,20 @@
"--memory-swap", memoryFlag,
"playground")
} else {
+ // Run builder directly, without Docker. This should only happen during
+ // development and in tests, never in production.
cmd = exec.Command("builder")
+
+ // Run the builder in a temp dir, so the bundle files and binaries do
+ // not clutter up the current working dir. This also allows parallel
+ // bundler runs, since otherwise the files from different runs stomp on
+ // each other.
+ tmpDir, err := ioutil.TempDir("", "pg-builder-")
+ if err != nil {
+ panic(fmt.Errorf("Error creating temp dir for builder: %v", err))
+ } else {
+ cmd.Dir = tmpDir
+ }
}
cmdKill := lib.DoOnce(func() {
event.Debug(j.res, "Killing program")
@@ -353,6 +370,9 @@
go func() {
docker("rm", "-f", j.id).Run()
}()
+ } else {
+ // Clean up after the builder process.
+ os.RemoveAll(cmd.Dir)
}
// If we timed out or errored out, do not cache anything.
diff --git a/go/src/playground/compilerd/jobqueue/jobqueue_test.go b/go/src/playground/compilerd/jobqueue/jobqueue_test.go
new file mode 100644
index 0000000..e00877a
--- /dev/null
+++ b/go/src/playground/compilerd/jobqueue/jobqueue_test.go
@@ -0,0 +1,440 @@
+// Copyright 2015 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package jobqueue
+
+import (
+ "bytes"
+ "fmt"
+ "os"
+ "os/exec"
+ "path"
+ "strconv"
+ "strings"
+ "sync"
+ "testing"
+ "time"
+
+ "playground/lib/event"
+)
+
+var (
+ defaultMaxTime = 10 * time.Second
+ defaultMaxSize = 1 << 16
+ defaultMemLimit = 100
+)
+
+func init() {
+ // Compile builder binary and put in path.
+ pgDir := os.ExpandEnv("${VANADIUM_ROOT}/release/projects/playground/go")
+
+ cmd := exec.Command("make", "builder")
+ cmd.Dir = path.Join(pgDir, "src", "playground")
+ if out, err := cmd.CombinedOutput(); err != nil {
+ fmt.Println("Error running 'make builder'")
+ fmt.Println(string(out))
+ panic(err)
+ }
+
+ pgBinDir := path.Join(pgDir, "bin")
+ if err := os.Setenv("PATH", pgBinDir+":"+os.Getenv("PATH")); err != nil {
+ panic(err)
+ }
+}
+
+// mockTestFile is a simple Go progam that will be sent to the dispatcher in the
+// test runs.
+var mockTestFile = `
+package main
+
+import(
+ "fmt"
+ "time"
+)
+
+func main() {
+ fmt.Printf("PROGRAM START")
+ time.Sleep(1 * time.Second)
+ fmt.Printf("PROGRAM END")
+}
+`
+
+// mockTestBody is a bundle containing the mockTestFile, as it would look if it
+// came from an http request from the playground client.
+var mockTestBody = []byte(fmt.Sprintf(`{
+ "files": [ {
+ "name": "src/main/main.go",
+ "body": %v
+ } ]
+}`, strconv.Quote(mockTestFile)))
+
+// testConfig encapsulates all the parameters and expectations for a single
+// test run.
+type testConfig struct {
+ // Number of jobs to enqueue.
+ jobs int
+
+ // Dispatcher configuration.
+ workers int
+ jobCap int
+
+ // Job configuration.
+ useDocker bool
+ maxSize int
+ maxTime time.Duration
+ memLimit int
+
+ // Test expectations. Default is to expect success.
+ expectEnqueueFail bool
+ expectOutputTooLarge bool
+ expectJobFail bool
+}
+
+func newMockResponseEventSink() *event.ResponseEventSink {
+ var b bytes.Buffer
+ return event.NewResponseEventSink(&b, false)
+}
+
+// eventsMatch returns true iff there is an event whose message matches the
+// given string.
+func eventsMatch(events []event.Event, match string) bool {
+ for _, e := range events {
+ if strings.Contains(e.Message, match) {
+ return true
+ }
+ }
+ return false
+}
+
+// assertExpectedResult asserts that the result matches the test expectations
+// in the test config.
+func assertExpectedResult(t *testing.T, c testConfig, r result) {
+ expectSuccess := !c.expectJobFail
+ if expectSuccess != r.Success {
+ t.Errorf("Expected result.Success to be %v but was %v. Test config: %#v", expectSuccess, r.Success, c)
+ }
+
+ if !r.Success {
+ return
+ }
+
+ if c.expectOutputTooLarge {
+ want := "Program output too large, killed."
+ if !eventsMatch(r.Events, want) {
+ t.Errorf("Event message %v not found in %#v. Test config: %#v", want, r.Events, c)
+ }
+ return
+ }
+
+ // Expect normal program output.
+ want := "PROGRAM START"
+ if !eventsMatch(r.Events, want) {
+ t.Errorf("Event message %v not found in %#v. Test config: %#v", want, r.Events, c)
+ }
+
+ want = "PROGRAM END"
+ if !eventsMatch(r.Events, want) {
+ t.Errorf("Event message %v not found in %#v. Test config: %#v", want, r.Events, c)
+ }
+}
+
+// runTest runs a particular test configuration. It starts a dispatcher, queues
+// jobs and waits for them to finish, and asserts that they match the
+// expectations in the testConfig.
+func runTest(t *testing.T, c testConfig) {
+ fmt.Printf("Testing %v jobs on %v workers with jobCap of %v and useDocker %v\n", c.jobs, c.workers, c.jobCap, c.useDocker)
+ d := NewDispatcher(c.workers, c.jobCap)
+
+ var enqueueError error
+
+ // wg waits for all the jobs to finish.
+ var wg sync.WaitGroup
+
+ // Start all the jobs.
+ for i := 0; i < c.jobs; i++ {
+ res := newMockResponseEventSink()
+ job := NewJob(mockTestBody, res, c.maxSize, c.maxTime, c.useDocker, c.memLimit)
+
+ resultChan, err := d.Enqueue(job)
+ if err != nil {
+ enqueueError = err
+ break
+ }
+
+ wg.Add(1)
+
+ go func() {
+ r := <-resultChan
+ assertExpectedResult(t, c, r)
+ wg.Done()
+ }()
+ }
+
+ if !c.expectEnqueueFail && enqueueError != nil {
+ t.Fatalf("Enqueue failed: %v. Test config: %#v", enqueueError, c)
+ }
+
+ if c.expectEnqueueFail && enqueueError == nil {
+ t.Fatalf("Expected Enqueue to fail but it did not. Test config: %#v", c)
+ }
+
+ // Test must finish in 30 seconds.
+ timeout := time.After(30 * time.Second)
+
+ jobsFinished := make(chan bool)
+
+ go func() {
+ wg.Wait()
+ jobsFinished <- true
+ }()
+
+ // Wait for timeout or all jobs to finish.
+ select {
+ case <-timeout:
+ t.Fatalf("Expected jobs to complete but got timeout. Test config: %#v", c)
+ case <-jobsFinished:
+ }
+
+ d.Stop()
+}
+
+func TestJobQueue(t *testing.T) {
+
+ // Test success cases without docker.
+ runTest(t, testConfig{
+ jobs: 1,
+ workers: 1,
+ jobCap: 1,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ useDocker: false,
+ })
+
+ runTest(t, testConfig{
+ jobs: 3,
+ workers: 1,
+ jobCap: 3,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ useDocker: false,
+ })
+
+ runTest(t, testConfig{
+ jobs: 3,
+ workers: 3,
+ jobCap: 3,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ useDocker: false,
+ })
+
+ runTest(t, testConfig{
+ jobs: 6,
+ workers: 3,
+ jobCap: 10,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ useDocker: false,
+ })
+
+ // Test success cases with docker.
+ runTest(t, testConfig{
+ jobs: 1,
+ workers: 1,
+ jobCap: 1,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ memLimit: defaultMemLimit,
+ useDocker: true,
+ })
+
+ runTest(t, testConfig{
+ jobs: 3,
+ workers: 1,
+ jobCap: 3,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ memLimit: defaultMemLimit,
+ useDocker: true,
+ })
+
+ runTest(t, testConfig{
+ jobs: 3,
+ workers: 3,
+ jobCap: 3,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ memLimit: defaultMemLimit,
+ useDocker: true,
+ })
+
+ runTest(t, testConfig{
+ jobs: 6,
+ workers: 3,
+ jobCap: 10,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ memLimit: defaultMemLimit,
+ useDocker: true,
+ })
+
+ // Test Enqueue should fail when job capacity is exceeded.
+ runTest(t, testConfig{
+ jobs: 5,
+ workers: 2,
+ jobCap: 2,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ useDocker: false,
+ expectEnqueueFail: true,
+ })
+
+ runTest(t, testConfig{
+ jobs: 5,
+ workers: 2,
+ jobCap: 2,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ memLimit: defaultMemLimit,
+ useDocker: true,
+ expectEnqueueFail: true,
+ })
+
+ // Test job should fail if it exceeds size limit.
+ runTest(t, testConfig{
+ jobs: 1,
+ workers: 1,
+ jobCap: 1,
+ maxSize: 100,
+ maxTime: defaultMaxTime,
+ useDocker: false,
+ expectOutputTooLarge: true,
+ })
+
+ runTest(t, testConfig{
+ jobs: 1,
+ workers: 1,
+ jobCap: 1,
+ maxSize: 100,
+ maxTime: defaultMaxTime,
+ memLimit: defaultMemLimit,
+ useDocker: true,
+ expectOutputTooLarge: true,
+ })
+
+ // Test job should fail if it exceeds max time.
+ runTest(t, testConfig{
+ jobs: 1,
+ workers: 1,
+ jobCap: 1,
+ maxSize: defaultMaxSize,
+ maxTime: 1 * time.Second,
+ useDocker: false,
+ expectJobFail: true,
+ })
+
+ runTest(t, testConfig{
+ jobs: 1,
+ workers: 1,
+ jobCap: 1,
+ maxSize: defaultMaxSize,
+ maxTime: 1 * time.Second,
+ useDocker: true,
+ expectJobFail: true,
+ })
+
+ // Test job should fail if it exceeds memory limit (docker only).
+ runTest(t, testConfig{
+ jobs: 1,
+ workers: 1,
+ jobCap: 1,
+ maxSize: defaultMaxSize,
+ maxTime: defaultMaxTime,
+ memLimit: 5,
+ useDocker: true,
+ expectJobFail: true,
+ })
+}
+
+func TestJobCancel(t *testing.T) {
+ d := NewDispatcher(1, 10)
+
+ // Create five jobs.
+ res1 := newMockResponseEventSink()
+ job1 := NewJob(mockTestBody, res1, defaultMaxSize, defaultMaxTime, false, defaultMemLimit)
+
+ res2 := newMockResponseEventSink()
+ job2 := NewJob(mockTestBody, res2, defaultMaxSize, defaultMaxTime, false, defaultMemLimit)
+
+ res3 := newMockResponseEventSink()
+ job3 := NewJob(mockTestBody, res3, defaultMaxSize, defaultMaxTime, false, defaultMemLimit)
+
+ res4 := newMockResponseEventSink()
+ job4 := NewJob(mockTestBody, res4, defaultMaxSize, defaultMaxTime, false, defaultMemLimit)
+
+ res5 := newMockResponseEventSink()
+ job5 := NewJob(mockTestBody, res5, defaultMaxSize, defaultMaxTime, false, defaultMemLimit)
+
+ // Cancel first job right away.
+ job1.Cancel()
+
+ // Queue all jobs.
+ resultChan1, err := d.Enqueue(job1)
+ if err != nil {
+ t.Fatalf("Enqueue failed: %v", err)
+ }
+ resultChan2, err := d.Enqueue(job2)
+ if err != nil {
+ t.Fatalf("Enqueue failed: %v", err)
+ }
+ resultChan3, err := d.Enqueue(job3)
+ if err != nil {
+ t.Fatalf("Enqueue failed: %v", err)
+ }
+ resultChan4, err := d.Enqueue(job4)
+ if err != nil {
+ t.Fatalf("Enqueue failed: %v", err)
+ }
+ resultChan5, err := d.Enqueue(job5)
+ if err != nil {
+ t.Fatalf("Enqueue failed: %v", err)
+ }
+
+ r1 := <-resultChan1
+ r2 := <-resultChan2
+
+ // Cancel second job after it has already run.
+ job2.Cancel()
+
+ // Cancel fourth job after it has been queued, but before it has run.
+ job4.Cancel()
+
+ r3 := <-resultChan3
+ r4 := <-resultChan4
+
+ // Wait half a second to give job 5 a chance to start running, then cancel it.
+ time.Sleep(500 * time.Millisecond)
+ job5.Cancel()
+
+ r5 := <-resultChan5
+
+ // Check that jobs 1 and 4 failed.
+ if r1.Success {
+ t.Errorf("Expected job 1 to fail but it succeeded.")
+ }
+ if r4.Success {
+ t.Errorf("Expected job 4 to fail but it succeeded.")
+ }
+
+ // Check that jobs 2, 3, and 5 succeeded.
+ if !r2.Success {
+ t.Errorf("Expected job 2 to succeed but it failed.")
+ }
+ if !r3.Success {
+ t.Errorf("Expected job 3 to succeed but it failed.")
+ }
+ if !r5.Success {
+ t.Errorf("Expected job 5 to succeed but it failed.")
+ }
+}
