Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/app/models/analytics/cycle_analytics/aggregation.rb b/app/models/analytics/cycle_analytics/aggregation.rb
index d43293f40ea..279938511fd 100644
--- a/app/models/analytics/cycle_analytics/aggregation.rb
+++ b/app/models/analytics/cycle_analytics/aggregation.rb
@@ -14,7 +14,10 @@ class Analytics::CycleAnalytics::Aggregation < ApplicationRecord
     return unless enabled
     return if last_incremental_run_at.nil?
 
-    estimation = (last_incremental_run_at - earliest_last_run_at) + average_aggregation_duration
+    estimation = duration_until_the_next_aggregation_job +
+      average_aggregation_duration +
+      (last_incremental_run_at - earliest_last_run_at)
+
     estimation < 1 ? nil : estimation.from_now
   end
 
@@ -29,6 +32,11 @@ class Analytics::CycleAnalytics::Aggregation < ApplicationRecord
 
   private
 
+  # The aggregation job is scheduled every 10 minutes: */10 * * * *
+  def duration_until_the_next_aggregation_job
+    (10 - (DateTime.current.minute % 10)).minutes.seconds
+  end
+
   def average_aggregation_duration
     return 0.seconds if incremental_runtimes_in_seconds.empty?