Fix task group name

Previously when creating a job, Poseidon would still use the old
task group name format instead of default-group as expected.
This commit is contained in:
sirkrypt0
2021-06-09 18:12:31 +02:00
parent 32fe47d669
commit 7bbd7b7bae
4 changed files with 9 additions and 13 deletions

View File

@@ -1,13 +1,12 @@
package nomad
import (
"fmt"
nomadApi "github.com/hashicorp/nomad/api"
)
const (
TaskGroupNameFormat = "%s-group"
TaskName = "default-task"
TaskGroupName = "default-group"
TaskName = "default-task"
)
// LoadJobList loads the list of jobs from the Nomad api.
@@ -23,13 +22,13 @@ func (nc *nomadAPIClient) JobScale(jobID string) (jobScale uint, err error) {
return
}
// ToDo: Consider counting also the placed and desired allocations
jobScale = uint(status.TaskGroups[fmt.Sprintf(TaskGroupNameFormat, jobID)].Running)
jobScale = uint(status.TaskGroups[TaskGroupName].Running)
return
}
// SetJobScale sets the scaling count of the passed job to Nomad.
func (nc *nomadAPIClient) SetJobScale(jobID string, count uint, reason string) (err error) {
intCount := int(count)
_, _, err = nc.client.Jobs().Scale(jobID, fmt.Sprintf(TaskGroupNameFormat, jobID), &intCount, reason, false, nil, nil)
_, _, err = nc.client.Jobs().Scale(jobID, TaskGroupName, &intCount, reason, false, nil, nil)
return
}