From 340cc1526893f46e34c887c9f9fb8db49fec2b8c Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Mon, 29 Apr 2019 10:14:10 +0200 Subject: [PATCH] scheduler: fix changegroup names run changegroup names are based on the run path but it will contain slashes and could be very long. So calculate the sha256 sum of the path and use it as the changegroup name. --- internal/services/scheduler/scheduler.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/services/scheduler/scheduler.go b/internal/services/scheduler/scheduler.go index f0e21e0..b70b2e2 100644 --- a/internal/services/scheduler/scheduler.go +++ b/internal/services/scheduler/scheduler.go @@ -22,6 +22,7 @@ import ( slog "github.com/sorintlab/agola/internal/log" "github.com/sorintlab/agola/internal/services/config" rsapi "github.com/sorintlab/agola/internal/services/runservice/scheduler/api" + "github.com/sorintlab/agola/internal/util" "github.com/pkg/errors" "go.uber.org/zap" @@ -89,7 +90,8 @@ func (s *Scheduler) scheduleRun(ctx context.Context, groupID string) error { //log.Infof("queued runs: %s", queuedRunsResponse.Runs) run := queuedRunsResponse.Runs[0] - runningRunsResponse, _, err := s.runserviceClient.GetGroupRunningRuns(ctx, groupID, 1, []string{fmt.Sprintf("changegroup-%s", groupID)}) + changegroup := util.EncodeSha256Hex(fmt.Sprintf("changegroup-%s", groupID)) + runningRunsResponse, _, err := s.runserviceClient.GetGroupRunningRuns(ctx, groupID, 1, []string{changegroup}) if err != nil { return errors.Wrapf(err, "failed to get running runs") }