Fix compile errors

src/funnel/cmd/server.go

@@ -56,10 +56,10 @@ var serverCmd = &cobra.Command{
 			return err
 		}
 
-		sched.AddBackend(gce.Factory)
-		sched.AddBackend(condor.Factory)
-		sched.AddBackend(openstack.Factory)
-		sched.AddBackend(local.Factory)
+		sched.AddBackend(gce.Plugin)
+		sched.AddBackend(condor.Plugin)
+		sched.AddBackend(openstack.Plugin)
+		sched.AddBackend(local.Plugin)
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()

src/funnel/scheduler/gce/util_test.go

@@ -44,7 +44,7 @@ func setup() *harness {
 	h := &harness{conf, srv, gce, gce}
 
 	// Add mock backend
-	h.srv.Scheduler.AddBackend(scheduler.BackendFactory{
+	h.srv.Scheduler.AddBackend(scheduler.BackendPlugin{
 		Name: "gce-mock",
 		Create: func(conf config.Config) (scheduler.Backend, error) {
 			log.Debug("Creating mock scheduler backend")

src/funnel/server/mocks/noop_backend.go

@@ -2,7 +2,6 @@ package mocks
 
 import (
 	"funnel/config"
-	"funnel/logger"
 	pbf "funnel/proto/funnel"
 	"funnel/proto/tes"
 	"funnel/scheduler"

src/funnel/server/mocks/server.go

@@ -90,7 +90,7 @@ func (m *Server) Start() {
 	m.stop = stop
 	m.Server.Start(ctx)
 	m.NoopWorker = NewNoopWorker(m.Conf)
-	m.Scheduler.AddBackend(scheduler.BackendFactory{
+	m.Scheduler.AddBackend(scheduler.BackendPlugin{
 		Name: "noop",
 		Create: func(conf config.Config) (scheduler.Backend, error) {
 			return scheduler.Backend(&NoopBackend{m.NoopWorker, conf}), nil
@@ -113,8 +113,8 @@ func (m *Server) Stop() {
 // manually sync the server and worker instead of depending
 // on tickers/timing.
 func (m *Server) Flush() {
-	s.Scheduler.Schedule(context.Background())
-	s.NoopWorker.Sync()
+	m.Scheduler.Schedule(context.Background())
+	m.NoopWorker.Sync()
 }
 
 // AddWorker adds the given worker to the database (calling db.UpdateWorker)

src/funnel/worker/docker.go

@@ -167,7 +167,6 @@ func setupDockerClient() *client.Client {
 	return dclient
 }
 
-// GetVolumes takes a jobID and returns an array of string.
 func formatVolumeArg(v Volume) string {
 	// `o` is structed as "HostPath:ContainerPath:Mode".
 	mode := "rw"