FIX: Prevent race condition when post processing post (#8819)
If a post is being cooked twice (for example after an edit), there is a chance the 'raw' and 'cooked' column to be inconsistent. This reduces the chances of that happening.
This commit is contained in:
parent
e9b6b0194c
commit
f14dd1f82d
|
@ -7,43 +7,45 @@ module Jobs
|
||||||
class ProcessPost < ::Jobs::Base
|
class ProcessPost < ::Jobs::Base
|
||||||
|
|
||||||
def execute(args)
|
def execute(args)
|
||||||
post = Post.find_by(id: args[:post_id])
|
DistributedMutex.synchronize("process_post_#{args[:post_id]}") do
|
||||||
# two levels of deletion
|
post = Post.find_by(id: args[:post_id])
|
||||||
return unless post.present? && post.topic.present?
|
# two levels of deletion
|
||||||
|
return unless post.present? && post.topic.present?
|
||||||
|
|
||||||
orig_cooked = post.cooked
|
orig_cooked = post.cooked
|
||||||
recooked = nil
|
recooked = nil
|
||||||
|
|
||||||
if args[:cook].present?
|
if args[:cook].present?
|
||||||
cooking_options = args[:cooking_options] || {}
|
cooking_options = args[:cooking_options] || {}
|
||||||
cooking_options[:topic_id] = post.topic_id
|
cooking_options[:topic_id] = post.topic_id
|
||||||
recooked = post.cook(post.raw, cooking_options.symbolize_keys)
|
recooked = post.cook(post.raw, cooking_options.symbolize_keys)
|
||||||
post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION)
|
post.update_columns(cooked: recooked, baked_at: Time.zone.now, baked_version: Post::BAKED_VERSION)
|
||||||
end
|
|
||||||
|
|
||||||
cp = CookedPostProcessor.new(post, args)
|
|
||||||
cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
|
|
||||||
|
|
||||||
# If we changed the document, save it
|
|
||||||
cooked = cp.html
|
|
||||||
|
|
||||||
if cooked != (recooked || orig_cooked)
|
|
||||||
|
|
||||||
if orig_cooked.present? && cooked.blank?
|
|
||||||
# TODO stop/restart the worker if needed, let's gather a few here first
|
|
||||||
Rails.logger.warn("Cooked post processor in FATAL state, bypassing. You need to urgently restart sidekiq\norig: #{orig_cooked}\nrecooked: #{recooked}\ncooked: #{cooked}\npost id: #{post.id}")
|
|
||||||
else
|
|
||||||
post.update_column(:cooked, cp.html)
|
|
||||||
extract_links(post)
|
|
||||||
post.publish_change_to_clients! :revised
|
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
if !post.user&.staff? && !post.user&.staged?
|
cp = CookedPostProcessor.new(post, args)
|
||||||
s = post.cooked
|
cp.post_process(bypass_bump: args[:bypass_bump], new_post: args[:new_post])
|
||||||
s << " #{post.topic.title}" if post.post_number == 1
|
|
||||||
if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
|
# If we changed the document, save it
|
||||||
PostActionCreator.create(Discourse.system_user, post, :inappropriate)
|
cooked = cp.html
|
||||||
|
|
||||||
|
if cooked != (recooked || orig_cooked)
|
||||||
|
|
||||||
|
if orig_cooked.present? && cooked.blank?
|
||||||
|
# TODO stop/restart the worker if needed, let's gather a few here first
|
||||||
|
Rails.logger.warn("Cooked post processor in FATAL state, bypassing. You need to urgently restart sidekiq\norig: #{orig_cooked}\nrecooked: #{recooked}\ncooked: #{cooked}\npost id: #{post.id}")
|
||||||
|
else
|
||||||
|
post.update_column(:cooked, cp.html)
|
||||||
|
extract_links(post)
|
||||||
|
post.publish_change_to_clients! :revised
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if !post.user&.staff? && !post.user&.staged?
|
||||||
|
s = post.cooked
|
||||||
|
s << " #{post.topic.title}" if post.post_number == 1
|
||||||
|
if !args[:bypass_bump] && WordWatcher.new(s).should_flag?
|
||||||
|
PostActionCreator.create(Discourse.system_user, post, :inappropriate)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue