summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-12-23 14:51:20 +0000
committerDouwe Maan <douwe@gitlab.com>2016-12-23 14:51:20 +0000
commit5866f7b30e2a5c0350cdef0872ba161c387ae7de (patch)
tree84a72cd843cb7ad74e15210a717f2c665d962196
parent518a0144b107e3fc802785d45ed873b4119c44a6 (diff)
parent89d3ef38ccc7be722a0906d08b51a48b1c8ff681 (diff)
downloadgitlab-ce-5866f7b30e2a5c0350cdef0872ba161c387ae7de.tar.gz
Merge branch 'process-commit-worker-large-batches' into 'master'
Improve ProcessCommitWorker for large push payloads Closes #25827 See merge request !8267
-rw-r--r--app/services/git_push_service.rb24
-rw-r--r--changelogs/unreleased/process-commit-worker-large-batches.yml4
-rw-r--r--spec/services/git_push_service_spec.rb19
3 files changed, 36 insertions, 11 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 185556c12cc..6bbc3a9d9ff 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -3,6 +3,9 @@ class GitPushService < BaseService
include Gitlab::CurrentSettings
include Gitlab::Access
+ # The N most recent commits to process in a single push payload.
+ PROCESS_COMMIT_LIMIT = 100
+
# This method will be called after each git update
# and only if the provided user and project are present in GitLab.
#
@@ -77,6 +80,16 @@ class GitPushService < BaseService
ProjectCacheWorker.perform_async(@project.id, types)
end
+ # Schedules processing of commit messages.
+ def process_commit_messages
+ default = is_default_branch?
+
+ push_commits.last(PROCESS_COMMIT_LIMIT).each do |commit|
+ ProcessCommitWorker.
+ perform_async(project.id, current_user.id, commit.to_hash, default)
+ end
+ end
+
protected
def execute_related_hooks
@@ -128,17 +141,6 @@ class GitPushService < BaseService
end
end
- # Extract any GFM references from the pushed commit messages. If the configured issue-closing regex is matched,
- # close the referenced Issue. Create cross-reference Notes corresponding to any other referenced Mentionables.
- def process_commit_messages
- default = is_default_branch?
-
- @push_commits.each do |commit|
- ProcessCommitWorker.
- perform_async(project.id, current_user.id, commit.to_hash, default)
- end
- end
-
def build_push_data
@push_data ||= Gitlab::DataBuilder::Push.build(
@project,
diff --git a/changelogs/unreleased/process-commit-worker-large-batches.yml b/changelogs/unreleased/process-commit-worker-large-batches.yml
new file mode 100644
index 00000000000..6fa31b62e4a
--- /dev/null
+++ b/changelogs/unreleased/process-commit-worker-large-batches.yml
@@ -0,0 +1,4 @@
+---
+title: Push payloads schedule at most 100 commits, instead of all commits
+merge_request:
+author:
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index e7624e70725..3303e808a9c 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -604,6 +604,25 @@ describe GitPushService, services: true do
end
end
+ describe '#process_commit_messages' do
+ let(:service) do
+ described_class.new(project,
+ user,
+ oldrev: sample_commit.parent_id,
+ newrev: sample_commit.id,
+ ref: 'refs/heads/master')
+ end
+
+ it 'only schedules a limited number of commits' do
+ allow(service).to receive(:push_commits).
+ and_return(Array.new(1000, double(:commit, to_hash: {})))
+
+ expect(ProcessCommitWorker).to receive(:perform_async).exactly(100).times
+
+ service.process_commit_messages
+ end
+ end
+
def execute_service(project, user, oldrev, newrev, ref)
service = described_class.new(project, user, oldrev: oldrev, newrev: newrev, ref: ref )
service.execute