Pass job's resources in env vars

mlowicki · Dec 7, 2018 · 7f3169a · 7f3169a
1 parent c3f3cc5
commit 7f3169a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/mesos/jobsscheduler/jobsscheduler.go b/mesos/jobsscheduler/jobsscheduler.go
@@ -285,18 +285,23 @@ func (sched *Scheduler) GetTasks(ctx context.Context, offer *mesos.Offer) []meso
 	return tasks
 }
 
+func strPtr(v string) *string { return &v }
+
 func (sched *Scheduler) newTaskInfo(job *model.Job) (*mesos.TaskInfo, error) {
 	taskID, err := newTaskID(job.Group, job.Project, job.ID)
 	if err != nil {
 		return nil, fmt.Errorf("Getting task ID failed: %s", err)
 	}
 	env := mesos.Environment{
 		Variables: []mesos.Environment_Variable{
-			{Name: "TASK_ID", Value: &taskID},
+			{Name: "RHYTHM_TASK_ID", Value: &taskID},
+			{Name: "RHYTHM_MEM", Value: strPtr(fmt.Sprintf("%g", job.Mem))},
+			{Name: "RHYTHM_DISK", Value: strPtr(fmt.Sprintf("%g", job.Disk))},
+			{Name: "RHYTHM_CPU", Value: strPtr(fmt.Sprintf("%g", job.CPUs))},
 		},
 	}
 	for k, v := range job.Env {
-		envvar := mesos.Environment_Variable{Name: k, Value: func(v string) *string { return &v }(v)}
+		envvar := mesos.Environment_Variable{Name: k, Value: strPtr(v)}
 		env.Variables = append(env.Variables, envvar)
 	}
 	for k, v := range job.Secrets {