Commit e773a8d2 authored by drew cimino's avatar drew cimino

Use @start_at instance variable in JobArtifact::DestroyAllExpiredService

parent 3d2e7b8e
...@@ -14,6 +14,7 @@ module Ci ...@@ -14,6 +14,7 @@ module Ci
def initialize def initialize
@removed_artifacts_count = 0 @removed_artifacts_count = 0
@start_at = Time.current
end end
## ##
...@@ -25,9 +26,9 @@ module Ci ...@@ -25,9 +26,9 @@ module Ci
def execute def execute
in_lock(EXCLUSIVE_LOCK_KEY, ttl: LOCK_TIMEOUT, retries: 1) do in_lock(EXCLUSIVE_LOCK_KEY, ttl: LOCK_TIMEOUT, retries: 1) do
if ::Feature.enabled?(:ci_destroy_unlocked_job_artifacts) if ::Feature.enabled?(:ci_destroy_unlocked_job_artifacts)
destroy_unlocked_job_artifacts(Time.current) destroy_unlocked_job_artifacts
else else
destroy_job_artifacts_with_slow_iteration(Time.current) destroy_job_artifacts_with_slow_iteration
end end
end end
...@@ -36,16 +37,16 @@ module Ci ...@@ -36,16 +37,16 @@ module Ci
private private
def destroy_unlocked_job_artifacts(start_at) def destroy_unlocked_job_artifacts
loop_until(timeout: LOOP_TIMEOUT, limit: LOOP_LIMIT) do loop_until(timeout: LOOP_TIMEOUT, limit: LOOP_LIMIT) do
artifacts = Ci::JobArtifact.expired_before(start_at).artifact_unlocked.limit(BATCH_SIZE) artifacts = Ci::JobArtifact.expired_before(@start_at).artifact_unlocked.limit(BATCH_SIZE)
service_response = destroy_batch(artifacts) service_response = destroy_batch(artifacts)
@removed_artifacts_count += service_response[:destroyed_artifacts_count] @removed_artifacts_count += service_response[:destroyed_artifacts_count]
end end
end end
def destroy_job_artifacts_with_slow_iteration(start_at) def destroy_job_artifacts_with_slow_iteration
Ci::JobArtifact.expired_before(start_at).each_batch(of: BATCH_SIZE, column: :expire_at, order: :desc) do |relation, index| Ci::JobArtifact.expired_before(@start_at).each_batch(of: BATCH_SIZE, column: :expire_at, order: :desc) do |relation, index|
# For performance reasons, join with ci_pipelines after the batch is queried. # For performance reasons, join with ci_pipelines after the batch is queried.
# See: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47496 # See: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47496
artifacts = relation.unlocked artifacts = relation.unlocked
...@@ -53,7 +54,7 @@ module Ci ...@@ -53,7 +54,7 @@ module Ci
service_response = destroy_batch(artifacts) service_response = destroy_batch(artifacts)
@removed_artifacts_count += service_response[:destroyed_artifacts_count] @removed_artifacts_count += service_response[:destroyed_artifacts_count]
break if loop_timeout?(start_at) break if loop_timeout?
break if index >= LOOP_LIMIT break if index >= LOOP_LIMIT
end end
end end
...@@ -62,8 +63,8 @@ module Ci ...@@ -62,8 +63,8 @@ module Ci
Ci::JobArtifacts::DestroyBatchService.new(artifacts).execute Ci::JobArtifacts::DestroyBatchService.new(artifacts).execute
end end
def loop_timeout?(start_at) def loop_timeout?
Time.current > start_at + LOOP_TIMEOUT Time.current > @start_at + LOOP_TIMEOUT
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment