Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
c7147bab
Unverified
Commit
c7147bab
authored
2 years ago
by
Claire
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix incorrect and slow cache invalidation in ClearDomainMediaService (#19062)
Fixes #19060
parent
1fac99e8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/services/clear_domain_media_service.rb
+16
-16
16 additions, 16 deletions
app/services/clear_domain_media_service.rb
with
16 additions
and
16 deletions
app/services/clear_domain_media_service.rb
+
16
−
16
View file @
c7147bab
...
...
@@ -10,24 +10,18 @@ class ClearDomainMediaService < BaseService
private
def
invalidate_association_caches!
def
invalidate_association_caches!
(
status_ids
)
# Normally, associated models of a status are immutable (except for accounts)
# so they are aggressively cached. After updating the media attachments to no
# longer point to a local file, we need to clear the cache to make those
# changes appear in the API and UI
@affected_
status_ids
.
each
{
|
id
|
Rails
.
cache
.
delete_matched
(
"statuses/
#{
id
}
-*"
)
}
Rails
.
cache
.
delete_multi
(
status_ids
.
map
{
|
id
|
"statuses/
#{
id
}
"
}
)
end
def
clear_media!
@affected_status_ids
=
[]
begin
clear_account_images!
clear_account_attachments!
clear_emojos!
ensure
invalidate_association_caches!
end
clear_account_images!
clear_account_attachments!
clear_emojos!
end
def
clear_account_images!
...
...
@@ -39,12 +33,18 @@ class ClearDomainMediaService < BaseService
end
def
clear_account_attachments!
media_from_blocked_domain
.
reorder
(
nil
).
find_each
do
|
attachment
|
@affected_status_ids
<<
attachment
.
status_id
if
attachment
.
status_id
.
present?
media_from_blocked_domain
.
reorder
(
nil
).
find_in_batches
do
|
attachments
|
affected_status_ids
=
[]
attachments
.
each
do
|
attachment
|
affected_status_ids
<<
attachment
.
status_id
if
attachment
.
status_id
.
present?
attachment
.
file
.
destroy
if
attachment
.
file
&
.
exists?
attachment
.
type
=
:unknown
attachment
.
save
end
attachment
.
file
.
destroy
if
attachment
.
file
&
.
exists?
attachment
.
type
=
:unknown
attachment
.
save
invalidate_association_caches!
(
affected_status_ids
)
unless
affected_status_ids
.
empty?
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment