Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 6 deletions

diff --git a/spec/workers/project_cache_worker_spec.rb b/spec/workers/project_cache_worker_spec.rb
index 7f42c700ce4..30c85464452 100644
--- a/spec/workers/project_cache_worker_spec.rb
+++ b/spec/workers/project_cache_worker_spec.rb
@@ -115,7 +115,7 @@ RSpec.describe ProjectCacheWorker do
           .twice
 
         expect(UpdateProjectStatisticsWorker).to receive(:perform_in)
-          .with(lease_timeout, project.id, statistics)
+          .with(lease_timeout, lease_key, project.id, statistics)
           .and_call_original
 
         expect(Namespaces::ScheduleAggregationWorker)
diff --git a/spec/workers/update_project_statistics_worker_spec.rb b/spec/workers/update_project_statistics_worker_spec.rb
index 1f840e363ea..2f356376d7c 100644
--- a/spec/workers/update_project_statistics_worker_spec.rb
+++ b/spec/workers/update_project_statistics_worker_spec.rb
@@ -3,17 +3,35 @@
 require 'spec_helper'
 
 RSpec.describe UpdateProjectStatisticsWorker do
+  include ExclusiveLeaseHelpers
+
   let(:worker) { described_class.new }
   let(:project) { create(:project, :repository) }
   let(:statistics) { %w(repository_size) }
+  let(:lease_key) { "namespace:namespaces_root_statistics:#{project.namespace_id}" }
 
   describe '#perform' do
-    it 'updates the project statistics' do
-      expect(Projects::UpdateStatisticsService).to receive(:new)
-        .with(project, nil, statistics: statistics)
-        .and_call_original
+    context 'when a lease could be obtained' do
+      it 'updates the project statistics' do
+        expect(Projects::UpdateStatisticsService).to receive(:new)
+          .with(project, nil, statistics: statistics)
+          .and_call_original
+
+        worker.perform(lease_key, project.id, statistics)
+      end
+    end
+
+    context 'when a lease could not be obtained' do
+      before do
+        stub_exclusive_lease_taken(lease_key, timeout: ProjectCacheWorker::LEASE_TIMEOUT)
+      end
+
+      it 'does not update the project statistics' do
+        lease_key = "namespace:namespaces_root_statistics:#{project.namespace_id}"
+        expect(Projects::UpdateStatisticsService).not_to receive(:new)
 
-      worker.perform(project.id, statistics)
+        worker.perform(lease_key, project.id, statistics)
+      end
     end
   end
 end