Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

4 files changed, 12 insertions, 39 deletions

diff --git a/app/workers/concerns/application_worker.rb b/app/workers/concerns/application_worker.rb
index f51c2852da6..222d045b0ba 100644
--- a/app/workers/concerns/application_worker.rb
+++ b/app/workers/concerns/application_worker.rb
@@ -16,6 +16,7 @@ module ApplicationWorker
   SAFE_PUSH_BULK_LIMIT = 1000
 
   included do
+    prefer_calling_context_feature_category false
     set_queue
     after_set_class_attribute { set_queue }
 
diff --git a/app/workers/concerns/git_garbage_collect_methods.rb b/app/workers/concerns/git_garbage_collect_methods.rb
index 5c0493c9be5..c5f8c9c8464 100644
--- a/app/workers/concerns/git_garbage_collect_methods.rb
+++ b/app/workers/concerns/git_garbage_collect_methods.rb
@@ -82,28 +82,12 @@ module GitGarbageCollectMethods
 
   def gitaly_call(task, resource)
     repository = resource.repository.raw_repository
+    client = repository.gitaly_repository_client
 
-    if Feature.enabled?(:optimized_housekeeping, container(resource))
-      client = repository.gitaly_repository_client
-
-      if task == :prune
-        client.prune_unreachable_objects
-      else
-        client.optimize_repository
-      end
+    if task == :prune
+      client.prune_unreachable_objects
     else
-      client = get_gitaly_client(task, repository)
-
-      case task
-      when :prune, :gc
-        client.garbage_collect(bitmaps_enabled?, prune: task == :prune)
-      when :full_repack
-        client.repack_full(bitmaps_enabled?)
-      when :incremental_repack
-        client.repack_incremental
-      when :pack_refs
-        client.pack_refs
-      end
+      client.optimize_repository
     end
   rescue GRPC::NotFound => e
     Gitlab::GitLogger.error("#{__method__} failed:\nRepository not found")
@@ -113,22 +97,6 @@ module GitGarbageCollectMethods
     raise Gitlab::Git::CommandError, e
   end
 
-  def get_gitaly_client(task, repository)
-    if task == :pack_refs
-      Gitlab::GitalyClient::RefService
-    else
-      Gitlab::GitalyClient::RepositoryService
-    end.new(repository)
-  end
-
-  # The option to enable/disable bitmaps has been removed in https://gitlab.com/gitlab-org/gitlab/-/issues/353777
-  # Now the options is always enabled
-  # This method and all the deprecated RPCs are going to be removed in
-  # https://gitlab.com/gitlab-org/gitlab/-/issues/353779
-  def bitmaps_enabled?
-    true
-  end
-
   def flush_ref_caches(resource)
     resource.repository.expire_branches_cache
     resource.repository.branch_names
@@ -136,8 +104,6 @@ module GitGarbageCollectMethods
   end
 
   def update_repository_statistics(resource, task)
-    return if task == :pack_refs
-
     resource.repository.expire_statistics_caches
 
     return if Gitlab::Database.read_only? # GitGarbageCollectWorker may be run on a Geo secondary
diff --git a/app/workers/concerns/update_repository_storage_worker.rb b/app/workers/concerns/update_repository_storage_worker.rb
index f46b64895a2..01744d1e57d 100644
--- a/app/workers/concerns/update_repository_storage_worker.rb
+++ b/app/workers/concerns/update_repository_storage_worker.rb
@@ -5,6 +5,7 @@ module UpdateRepositoryStorageWorker
   include ApplicationWorker
 
   included do
+    deduplicate :until_executed
     idempotent!
     feature_category :gitaly
     urgency :throttled
diff --git a/app/workers/concerns/worker_attributes.rb b/app/workers/concerns/worker_attributes.rb
index 8a135bc1853..1674ed1483a 100644
--- a/app/workers/concerns/worker_attributes.rb
+++ b/app/workers/concerns/worker_attributes.rb
@@ -38,12 +38,17 @@ module WorkerAttributes
       set_class_attribute(:feature_category, value)
     end
 
+    def prefer_calling_context_feature_category(preference = false)
+      set_class_attribute(:prefer_calling_context_feature_category, preference)
+    end
+
     # Special case: if a worker is not owned, get the feature category
     # (if present) from the calling context.
     def get_feature_category
       feature_category = get_class_attribute(:feature_category)
+      calling_context_feature_category_preferred = !!get_class_attribute(:prefer_calling_context_feature_category)
 
-      return feature_category unless feature_category == :not_owned
+      return feature_category unless feature_category == :not_owned || calling_context_feature_category_preferred
 
       Gitlab::ApplicationContext.current_context_attribute('meta.feature_category') || feature_category
     end