Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-20 12:16:11 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-20 12:16:11 +0300
commitedaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch)
tree11f143effbfeba52329fb7afbd05e6e2a3790241 /app/workers/concerns
parentd8a5691316400a0f7ec4f83832698f1988eb27c1 (diff)
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'app/workers/concerns')
-rw-r--r--app/workers/concerns/application_worker.rb16
-rw-r--r--app/workers/concerns/cluster_agent_queue.rb10
-rw-r--r--app/workers/concerns/dependency_proxy/expireable.rb2
-rw-r--r--app/workers/concerns/packages/cleanup_artifact_worker.rb (renamed from app/workers/concerns/dependency_proxy/cleanup_worker.rb)17
4 files changed, 22 insertions, 23 deletions
diff --git a/app/workers/concerns/application_worker.rb b/app/workers/concerns/application_worker.rb
index d0b09c15289..83261d9e42e 100644
--- a/app/workers/concerns/application_worker.rb
+++ b/app/workers/concerns/application_worker.rb
@@ -189,12 +189,8 @@ module ApplicationWorker
schedule_at = bulk_schedule_at
end
- if Feature.enabled?(:sidekiq_push_bulk_in_batches)
- in_safe_limit_batches(args_list, schedule_at) do |args_batch, schedule_at_for_batch|
- Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch, 'at' => schedule_at_for_batch)
- end
- else
- Sidekiq::Client.push_bulk('class' => self, 'args' => args_list, 'at' => schedule_at)
+ in_safe_limit_batches(args_list, schedule_at) do |args_batch, schedule_at_for_batch|
+ Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch, 'at' => schedule_at_for_batch)
end
end
@@ -207,12 +203,8 @@ module ApplicationWorker
private
def do_push_bulk(args_list)
- if Feature.enabled?(:sidekiq_push_bulk_in_batches)
- in_safe_limit_batches(args_list) do |args_batch, _|
- Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch)
- end
- else
- Sidekiq::Client.push_bulk('class' => self, 'args' => args_list)
+ in_safe_limit_batches(args_list) do |args_batch, _|
+ Sidekiq::Client.push_bulk('class' => self, 'args' => args_batch)
end
end
diff --git a/app/workers/concerns/cluster_agent_queue.rb b/app/workers/concerns/cluster_agent_queue.rb
new file mode 100644
index 00000000000..68de7cca135
--- /dev/null
+++ b/app/workers/concerns/cluster_agent_queue.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module ClusterAgentQueue
+ extend ActiveSupport::Concern
+
+ included do
+ queue_namespace :cluster_agent
+ feature_category :kubernetes_management
+ end
+end
diff --git a/app/workers/concerns/dependency_proxy/expireable.rb b/app/workers/concerns/dependency_proxy/expireable.rb
index 9650ac85c6c..7e37db36bef 100644
--- a/app/workers/concerns/dependency_proxy/expireable.rb
+++ b/app/workers/concerns/dependency_proxy/expireable.rb
@@ -10,7 +10,7 @@ module DependencyProxy
def expire_artifacts(collection)
collection.each_batch(of: UPDATE_BATCH_SIZE) do |batch|
- batch.update_all(status: :expired)
+ batch.update_all(status: :pending_destruction)
end
end
end
diff --git a/app/workers/concerns/dependency_proxy/cleanup_worker.rb b/app/workers/concerns/packages/cleanup_artifact_worker.rb
index b668634f233..db6c7330ea3 100644
--- a/app/workers/concerns/dependency_proxy/cleanup_worker.rb
+++ b/app/workers/concerns/packages/cleanup_artifact_worker.rb
@@ -1,8 +1,9 @@
# frozen_string_literal: true
-module DependencyProxy
- module CleanupWorker
+module Packages
+ module CleanupArtifactWorker
extend ActiveSupport::Concern
+ include LimitedCapacity::Worker
include Gitlab::Utils::StrongMemoize
def perform_work
@@ -15,12 +16,8 @@ module DependencyProxy
artifact&.error!
end
- def max_running_jobs
- ::Gitlab::CurrentSettings.dependency_proxy_ttl_group_policy_worker_capacity
- end
-
def remaining_work_count
- expired_artifacts.limit(max_running_jobs + 1).count
+ artifacts_pending_destruction.limit(max_running_jobs + 1).count
end
private
@@ -52,12 +49,12 @@ module DependencyProxy
end
end
- def expired_artifacts
- model.expired
+ def artifacts_pending_destruction
+ model.pending_destruction
end
def next_item
- expired_artifacts.lock_next_by(:updated_at).first
+ model.next_pending_destruction(order_by: :updated_at)
end
end
end