Revert scheduler updates

compute/scheduler/node.go

@@ -41,7 +41,7 @@ func NewNodeProcess(ctx context.Context, conf config.Config, factory Worker, log
 		conf:      conf,
 		client:    cli,
 		log:       log,
-		resources: res,
+		resources: &res,
 		workerRun: factory,
 		workers:   newRunSet(),
 		timeout:   timeout,
@@ -154,7 +154,7 @@ func (n *NodeProcess) sync(ctx context.Context) {
 
 	// Node data has been updated. Send back to server for database update.
 	var derr error
-	n.resources, derr = detectResources(n.conf.Node, n.conf.Worker.WorkDir)
+	*n.resources, derr = detectResources(n.conf.Node, n.conf.Worker.WorkDir)
 	if derr != nil {
 		n.log.Error("error detecting resources", "error", derr)
 	}

compute/scheduler/testutils_test.go

@@ -32,7 +32,7 @@ func newTestNode(conf config.Config, t *testing.T) testNode {
 		conf:      conf,
 		client:    s,
 		log:       log,
-		resources: res,
+		resources: &res,
 		workerRun: NoopWorker,
 		workers:   newRunSet(),
 		timeout:   util.NewIdleTimeout(time.Duration(conf.Node.Timeout)),
@@ -81,17 +81,14 @@ func (t *testNode) AddTasks(ids ...string) {
 
 func timeLimit(t *testing.T, d time.Duration) func() {
 	stop := make(chan struct{})
-	done := make(chan struct{})
 	go func() {
 		select {
 		case <-time.NewTimer(d).C:
-			t.Error("time limit expired")
-			close(stop)
-		case <-done:
+			t.Fatal("time limit expired")
+		case <-stop:
 		}
 	}()
 	return func() {
-		close(done)
-		<-stop
+		close(stop)
 	}
 }

compute/scheduler/util.go

@@ -23,8 +23,8 @@ func GenNodeID() string {
 //
 // Upon error, detectResources will return the resources given by the config
 // with the error.
-func detectResources(conf config.Node, workdir string) (*Resources, error) {
-	res := &Resources{
+func detectResources(conf config.Node, workdir string) (Resources, error) {
+	res := Resources{
 		Cpus:   conf.Resources.Cpus,
 		RamGb:  conf.Resources.RamGb,
 		DiskGb: conf.Resources.DiskGb,