Skip to content

A platform for community discussion. Free, open, simple.

FIX: Save workflow waits atomically to preserve resume data (#43722)

Régis Hanol3ecfffc5abc5
diff --git a/plugins/discourse-workflows/lib/discourse_workflows/executor/execution_store.rb b/plugins/discourse-workflows/lib/discourse_workflows/executor/execution_store.rb
index e364d19c6bc..3446e5ac313 100644
--- a/plugins/discourse-workflows/lib/discourse_workflows/executor/execution_store.rb
+++ b/plugins/discourse-workflows/lib/discourse_workflows/executor/execution_store.rb
@@ -100,14 +100,17 @@ module DiscourseWorkflows
end
def pause_waiting_execution!(node:, waiting_until: nil, timeout_action: nil, steps: [])
- execution.update!(
- status: :waiting,
- waiting_node_id: node.id,
- waiting_until: waiting_until,
- resume_token: @execution_context.resume_token,
- timeout_action: timeout_action,
- )
- save!(steps)
+ execution.transaction do
+ execution.update!(
+ status: :waiting,
+ waiting_node_id: node.id,
+ waiting_until: waiting_until,
+ resume_token: @execution_context.resume_token,
+ timeout_action: timeout_action,
+ )
+ save!(steps)
+ end
+
publish_waiting_form_notification(node)
publish_progress(refresh: true)
execution
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/execution_store_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/execution_store_spec.rb
index 354663e0745..d088fab78cc 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/execution_store_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/executor/execution_store_spec.rb
@@ -276,6 +276,19 @@ RSpec.describe DiscourseWorkflows::Executor::ExecutionStore do
expect(store.execution.reload.timeout_action).to be_nil
end
+
+ it "keeps the execution running when its waiting checkpoint cannot be saved",
+ :aggregate_failures do
+ interrupt_checkpoint = -> { raise Sidekiq::Shutdown }
+ DiscourseWorkflows::ExecutionData.set_callback(:save, :before, interrupt_checkpoint)
+
+ expect { store.pause_waiting_execution!(node: node) }.to raise_error(Sidekiq::Shutdown)
+
+ expect(store.execution.reload).to have_attributes(status: "running", waiting_node_id: nil)
+ expect(store.execution.execution_data).to be_nil
+ ensure
+ DiscourseWorkflows::ExecutionData.skip_callback(:save, :before, interrupt_checkpoint)
+ end
end
describe "wait-state cleanup" do