Skip to content

Commit

Permalink
DEVPROD-14942: Exclude already generated tasks from max tasks error (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
hadjri authored Mar 10, 2025
1 parent 97288b1 commit 155f13f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions model/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func (g *GeneratedProject) saveNewBuildsAndTasks(ctx context.Context, settings *
return errors.Wrap(err, "creating task ID table for new variant-tasks to create")
}
tasksToBeGenerated := allTasksToBeCreatedIncludingDeps.Length()
if err = validateGeneratedProjectMaxTasks(ctx, v, tasksToBeGenerated); err != nil {
if err = validateGeneratedProjectMaxTasks(ctx, v, g.Task.Id, tasksToBeGenerated); err != nil {
return errors.Wrapf(err, "validating the number of tasks to be added by '%s'", g.Task.Id)
}
span.SetAttributes(attribute.Int(numGenerateTasksAttribute, tasksToBeGenerated))
Expand Down Expand Up @@ -400,9 +400,10 @@ func getBuildVariantsFromPairs(pairs TaskVariantPairs) []string {
return uniqueBVs
}

func validateGeneratedProjectMaxTasks(ctx context.Context, v *Version, tasksToBeCreated int) error {
func validateGeneratedProjectMaxTasks(ctx context.Context, v *Version, taskID string, tasksToBeCreated int) error {
numExistingTasks, err := task.Count(ctx, db.Query(bson.M{
task.VersionKey: v.Id,
task.VersionKey: v.Id,
task.GeneratedByKey: bson.M{"$ne": taskID},
}))
if err != nil {
return errors.Wrapf(err, "counting tasks for version '%s'", v.Id)
Expand Down

0 comments on commit 155f13f

Please sign in to comment.